first stab at SSPI leaving gss calls in

libtirpc/tirpc/rpc/auth.h

@@ -188,10 +188,9 @@ typedef struct __auth {
 	struct auth_ops {
 		void	(*ah_nextverf) (struct __auth *);
 		/* nextverf & serialize */
-		int	(*ah_marshal) (struct __auth *, XDR *);
+		int	(*ah_marshal) (struct __auth *, XDR *, u_int *);
 		/* validate verifier */
-		int	(*ah_validate) (struct __auth *,
-			    struct opaque_auth *);
+		int	(*ah_validate) (struct __auth *, struct opaque_auth *, u_int);
 		/* refresh credentials */
 		int	(*ah_refresh) (struct __auth *, void *);
 		/* destroy this structure */
@@ -219,15 +218,15 @@ typedef struct __auth {
 #define auth_nextverf(auth)		\
 		((*((auth)->ah_ops->ah_nextverf))(auth))
 
-#define AUTH_MARSHALL(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-#define auth_marshall(auth, xdrs)	\
+#define AUTH_MARSHALL(auth, xdrs, seq)	\
+		((*((auth)->ah_ops->ah_marshal))(auth, xdrs, seq))
+#define auth_marshall(auth, xdrs, seq)	\
 		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
 
-#define AUTH_VALIDATE(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-#define auth_validate(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
+#define AUTH_VALIDATE(auth, verfp, seq)	\
+		((*((auth)->ah_ops->ah_validate))((auth), verfp, seq))
+#define auth_validate(auth, verfp, seq)	\
+		((*((auth)->ah_ops->ah_validate))((auth), verfp, seq))
 
 #define AUTH_REFRESH(auth, msg)		\
 		((*((auth)->ah_ops->ah_refresh))(auth, msg))

libtirpc/tirpc/rpc/auth_sspi.h

@@ -0,0 +1,117 @@
+/* Copyright (c) 2010
+ * The Regents of the University of Michigan
+ * All Rights Reserved
+ *
+ * Permission is granted to use, copy and redistribute this software
+ * for noncommercial education and research purposes, so long as no
+ * fee is charged, and so long as the name of the University of Michigan
+ * is not used in any advertising or publicity pertaining to the use
+ * or distribution of this software without specific, written prior
+ * authorization.  Permission to modify or otherwise create derivative
+ * works of this software is not granted.
+ *
+ * This software is provided as is, without representation or warranty
+ * of any kind either express or implied, including without limitation
+ * the implied warranties of merchantability, fitness for a particular
+ * purpose, or noninfringement.  The Regents of the University of
+ * Michigan shall not be liable for any damages, including special,
+ * indirect, incidental, or consequential damages, with respect to any
+ * claim arising out of or in connection with the use of the software,
+ * even if it has been or is hereafter advised of the possibility of
+ * such damages.
+ */
+
+#ifndef _TIRPC_AUTH_GSS_H
+#define _TIRPC_AUTH_GSS_H
+
+#include <rpc/clnt.h>
+#define SECURITY_WIN32
+#include <security.h>
+
+/* RPCSEC_SSPI control procedures. */
+typedef enum {
+	RPCSEC_SSPI_DATA = 0,
+	RPCSEC_SSPI_INIT = 1,
+	RPCSEC_SSPI_CONTINUE_INIT = 2,
+	RPCSEC_SSPI_DESTROY = 3
+} rpc_sspi_proc_t;
+
+/* RPCSEC_SSPI services. */
+typedef enum {
+	RPCSEC_SSPI_SVC_NONE = 1,
+	RPCSEC_SSPI_SVC_INTEGRITY = 2,
+	RPCSEC_SSPI_SVC_PRIVACY = 3
+} rpc_sspi_svc_t;
+
+#define RPCSEC_SSPI_VERSION	1
+
+#define sspi_name_t SEC_CHAR *
+#define sspi_qop_t uint32_t
+
+typedef struct _sspi_OID_desc {
+    int length;
+    void *elements;
+} sspi_OID_desc, *sspi_OID;
+
+typedef struct _sspi_buffer_desc {
+    int length;
+    void *value;
+} sspi_buffer_desc, *sspi_buffer_t;
+
+#define SSPI_C_NO_NAME ((sspi_name_t) NULL)
+#define SSPI_C_NO_BUFFER ((sspi_buffer_t) NULL)
+#define SSPI_C_NO_CONTEXT ((PCtxtHandle) NULL)
+
+/* RPCSEC_SSPI security triple. */
+struct rpc_sspi_sec {
+	sspi_OID        mech;		/* mechanism */
+	uint32_t        qop;		/* quality of protection */
+	rpc_sspi_svc_t	svc;		/* service */
+    CredHandle      cred;       /* cred handle */
+	u_int		    req_flags;	/* req flags for init_sec_context */
+    TimeStamp       expiry;
+};
+
+/* Credentials. */
+struct rpc_sspi_cred {
+	u_int		        gc_v;		/* version */
+	rpc_sspi_proc_t	    gc_proc;	/* control procedure */
+	u_int		        gc_seq;		/* sequence number */
+	rpc_sspi_svc_t	    gc_svc;		/* service */
+	sspi_buffer_desc	gc_ctx;		/* server's returned context handle */
+};
+
+/* Context creation response. */
+struct rpc_sspi_init_res {
+	sspi_buffer_desc    gr_ctx;		/* context handle */
+	u_int			    gr_major;	/* major status */
+	u_int			    gr_minor;	/* minor status */
+	u_int			    gr_win;		/* sequence window */
+	sspi_buffer_desc    gr_token;	/* token */
+};
+
+/* Prototypes. */
+__BEGIN_DECLS
+bool_t xdr_rpc_sspi_cred(XDR *xdrs, struct rpc_sspi_cred *p);
+bool_t xdr_rpc_sspi_init_args(XDR *xdrs, sspi_buffer_desc *p);
+bool_t xdr_rpc_sspi_init_res(XDR *xdrs, struct rpc_sspi_init_res *p);
+bool_t xdr_rpc_sspi_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, 
+                         PCtxtHandle ctx, sspi_qop_t qop, 
+                         rpc_sspi_svc_t svc, u_int seq);
+AUTH *authsspi_create(CLIENT *, sspi_name_t, struct rpc_sspi_sec *);
+AUTH *authsspi_create_default(CLIENT *, char *, int);
+bool_t authsspi_service(AUTH *auth, int svc);
+uint32_t sspi_get_mic(void *ctx, u_int qop, u_int seq, 
+                      sspi_buffer_desc *bufin, sspi_buffer_desc *bufout);
+uint32_t sspi_verify_mic(void *ctx, u_int seq, sspi_buffer_desc *bufin, 
+                         sspi_buffer_desc *bufout, u_int *qop_state);
+void sspi_release_buffer(sspi_buffer_desc *buf);
+uint32_t sspi_import_name(sspi_buffer_desc *name_in, sspi_name_t *name_out);
+
+void log_debug(const char *fmt, ...);
+void log_status(char *m, uint32_t major, uint32_t minor);
+void log_hexdump(bool_t on, const u_char *title, const u_char *buf, int len, int offset);
+
+__END_DECLS
+
+#endif /* !_TIRPC_AUTH_GSS_H */

libtirpc/tirpc/rpc/xdr.h

@@ -354,6 +354,7 @@ extern void   xdrrec_create(XDR *, u_int, u_int, void *,
 
 /* make end of xdr record */
 extern bool_t xdrrec_endofrecord(XDR *, int);
+extern int32_t *xdrrec_getoutbase(XDR *);
 
 /* move to beginning of next record */
 extern bool_t xdrrec_skiprecord(XDR *);