svn rev #22106: tools/gssmonger/trunk/gssmaggot/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22106
Commit By: raeburn
Log Message:
build WrapEx code everywhere, return error for sspi or ifndef HAVE_GSS_WRAP_EX


Changed Files:
U   tools/gssmonger/trunk/gssmaggot/gssapi.c
U   tools/gssmonger/trunk/gssmaggot/handlers.c
U   tools/gssmonger/trunk/gssmaggot/sspi.c
Modified: tools/gssmonger/trunk/gssmaggot/gssapi.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-17 21:49:46 UTC (rev 22105)
+++ tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-17 21:54:00 UTC (rev 22106)
@@ -988,7 +988,6 @@
         
 }
 
-#if 1
 ULONG
 DoWrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs,
 	  IN PHCTXT     phContext,
@@ -1008,7 +1007,7 @@
 	  OUT PULONG    pcbPad,
 	  OUT PVOID     *ppvTrailer,
 	  OUT PULONG    pcbTrailer ) {
-
+#ifdef HAVE_GSS_WRAP_EX
     GSSERRTYPE         minor = 0;
     ULONG              ulRet = GSMERR_TEST_ISSUE;
     gss_iov_buffer_desc Buffers[5] = { { 0 } };
@@ -1059,6 +1058,9 @@
     *pcbTrailer = Buffers[4].buffer.length;
 
     return ulRet;
+#else
+    return GSMERR_NOT_SUPPORTED;
+#endif
 }
 
 ULONG
@@ -1080,6 +1082,7 @@
 
 	    OUT PVOID                  *ppvClear,
 	    OUT PULONG                 pcbClear ) {
+#ifdef HAVE_GSS_WRAP_EX
     gss_iov_buffer_desc Buffers[5] = { { 0 } };
     GSSERRTYPE          minor = 0;
     ULONG               ulRet = GSMERR_TEST_ISSUE;
@@ -1117,8 +1120,10 @@
     *pcbClear = Buffers[1].buffer.length;
 
     return ulRet;
+#else
+    return GSMERR_NOT_SUPPORTED;
+#endif
 }
-#endif
 
 VOID
 FreeMessageOutput( IN ULONG cbData,

Modified: tools/gssmonger/trunk/gssmaggot/handlers.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/handlers.c	2009-03-17 21:49:46 UTC (rev 22105)
+++ tools/gssmonger/trunk/gssmaggot/handlers.c	2009-03-17 21:54:00 UTC (rev 22106)
@@ -1339,7 +1339,6 @@
 
 }
 
-#if 1
 /*++**************************************************************
   NAME:      HandleWrapEx
 
@@ -1622,7 +1621,6 @@
     return ret;
 
 }
-#endif
 
 /*++**************************************************************
   NAME:      HandleVerify

Modified: tools/gssmonger/trunk/gssmaggot/sspi.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/sspi.c	2009-03-17 21:49:46 UTC (rev 22105)
+++ tools/gssmonger/trunk/gssmaggot/sspi.c	2009-03-17 21:54:00 UTC (rev 22106)
@@ -1685,6 +1685,52 @@
                       pcbString );
 }
 
+ULONG
+DoWrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs,
+	  IN PHCTXT     phContext,
+	  IN ULONG      Flags,
+	  IN ULONG      SeqNo,
+	  IN ULONG      Conf,
+	  IN PVOID      Message1,
+	  IN ULONG      cbMessage1,
+	  IN PVOID      Message2,
+	  IN ULONG      cbMessage2,
+
+	  OUT PVOID     *ppvHeader,
+	  OUT PULONG    pcbHeader,
+	  OUT PVOID     *ppvCrypt,
+	  OUT PULONG    pcbCrypt,
+	  OUT PVOID     *ppvPad,
+	  OUT PULONG    pcbPad,
+	  OUT PVOID     *ppvTrailer,
+	  OUT PULONG    pcbTrailer )
+{
+    return GSMERR_NOT_SUPPORTED;
+}
+
+ULONG
+DoUnwrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs,
+	    IN PHCTXT                  phContext,
+	    IN ULONG                   Flags,
+	    IN ULONG                   SeqNo,
+
+	    IN PVOID                   pvHeader,
+	    IN ULONG                   cbHeader,
+	    IN PVOID                   pvCrypt,
+	    IN ULONG                   cbCrypt,
+	    IN PVOID                   pvSign,
+	    IN ULONG                   cbSign,
+	    IN PVOID                   pvPad,
+	    IN ULONG                   cbPad,
+	    IN PVOID                   pvTrailer,
+	    IN ULONG                   cbTrailer,
+
+	    OUT PVOID                  *ppvClear,
+	    OUT PULONG                 pcbClear )
+{
+    return GSMERR_NOT_SUPPORTED;
+}
+
 /*++**************************************************************
   NAME:      FreeMessageOutput