svn rev #22085: tools/gssmonger/trunk/ gssmaggot/ gssmaster/ include/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22085
Commit By: raeburn
Log Message:
Tweak WrapEx message to include a confidentiality flag, and send it from the
master.



Changed Files:
U   tools/gssmonger/trunk/gssmaggot/gssapi.c
U   tools/gssmonger/trunk/gssmaggot/handlers.c
U   tools/gssmonger/trunk/gssmaster/clientapis.c
U   tools/gssmonger/trunk/include/helpers.h
Modified: tools/gssmonger/trunk/gssmaggot/gssapi.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-13 21:16:14 UTC (rev 22084)
+++ tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-13 23:03:00 UTC (rev 22085)
@@ -994,6 +994,7 @@
 	  IN PHCTXT     phContext,
 	  IN ULONG      Flags,
 	  IN ULONG      SeqNo,
+	  IN ULONG      Conf,
 	  IN PVOID      Message1,
 	  IN ULONG      cbMessage1,
 	  IN PVOID      Message2,
@@ -1011,7 +1012,7 @@
     GSSERRTYPE         minor = 0;
     ULONG              ulRet = GSMERR_TEST_ISSUE;
     gss_iov_buffer_desc Buffers[5] = { { 0 } };
-    int                conf = 1;
+    int                conf = Conf;
 
     UNUSED_PARAMETER( Flags );
     UNUSED_PARAMETER( SeqNo );
@@ -1035,7 +1036,7 @@
      */
     ulRet = gss_wrap_iov ( &minor,
 			   *phContext,
-			   1, /* conf */
+			   conf, /* conf */
 			   GSS_C_QOP_DEFAULT,
 			   &conf,
 			   Buffers,

Modified: tools/gssmonger/trunk/gssmaggot/handlers.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/handlers.c	2009-03-13 21:16:14 UTC (rev 22084)
+++ tools/gssmonger/trunk/gssmaggot/handlers.c	2009-03-13 23:03:00 UTC (rev 22085)
@@ -1357,7 +1357,7 @@
 HandleWrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs ) {
 
     ULONG       ulRet = GSMERR_OK;
-    ULONG       ulContextId, Flags, SeqNo;
+    ULONG       ulContextId, Flags, SeqNo, Conf;
     LPSTR       PlainText1, PlainText2;
     PVOID       pvCipher = NULL, pvHeader = NULL, pvPad = NULL, pvTrailer = NULL;
     ULONG       cbCipher = 0, cbString1 = 0, cbString2 = 0, cbPad = 0, cbHeader = 0, cbTrailer = 0;
@@ -1368,6 +1368,7 @@
       { "ContextId",  sizeof( ulContextId ), &ulContextId, NETARG_NUMBER },
       { "Flags",      sizeof( Flags ),       &Flags,       NETARG_NUMBER },
       { "SeqNo",      sizeof( SeqNo ),       &SeqNo,       NETARG_NUMBER },
+      { "Conf",       sizeof( Conf ),        &Conf,        NETARG_NUMBER },
       { "Plaintext1",  
 
         0, NULL, /* unknown size */
@@ -1412,6 +1413,7 @@
 			 phContext,
 			 Flags,
 			 SeqNo,
+			 Conf,
 			 PlainText1,
 			 cbString1,
 			 PlainText2,

Modified: tools/gssmonger/trunk/gssmaster/clientapis.c
===================================================================
--- tools/gssmonger/trunk/gssmaster/clientapis.c	2009-03-13 21:16:14 UTC (rev 22084)
+++ tools/gssmonger/trunk/gssmaster/clientapis.c	2009-03-13 23:03:00 UTC (rev 22085)
@@ -915,11 +915,13 @@
 	      OUT PULONG  pcbTrailer ) {
 
     ULONG       ret = GSMERR_OK;
+    ULONG Conf = 1;
     NETARGENTRY InputEntries[] = {
 
       { "ContextId",  sizeof( ulContextId ), &ulContextId, NETARG_NUMBER },
       { "Flags",      sizeof( Flags ),       &Flags,       NETARG_NUMBER },
       { "SeqNo",      sizeof( SeqNo ),       &SeqNo,       NETARG_NUMBER },
+      { "Conf",       sizeof( Conf ),        &Conf,        NETARG_NUMBER },
       { "Plaintext",  cbPlain,                pvPlain,     ( NETARG_GENERIC |
                                                              NETARG_LENGTH_ENCODE ) },
       { "Sign-only",  cbSign,                 pvSign,      ( NETARG_GENERIC |

Modified: tools/gssmonger/trunk/include/helpers.h
===================================================================
--- tools/gssmonger/trunk/include/helpers.h	2009-03-13 21:16:14 UTC (rev 22084)
+++ tools/gssmonger/trunk/include/helpers.h	2009-03-13 23:03:00 UTC (rev 22085)
@@ -187,6 +187,7 @@
 	  IN PHCTXT     phContext,
 	  IN ULONG      Flags,
 	  IN ULONG      SeqNo,
+	  IN ULONG      Conf,
 	  IN PVOID      Message1,
 	  IN ULONG      cbMessage1,
 	  IN PVOID      Message2,
@@ -201,24 +202,25 @@
 	  OUT PVOID     *ppvTrailer,
 	  OUT PULONG    pcbTrailer );
 ULONG
-DoWrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs,
-	  IN PHCTXT     phContext,
-	  IN ULONG      Flags,
-	  IN ULONG      SeqNo,
-	  IN PVOID      Message1,
-	  IN ULONG      cbMessage1,
-	  IN PVOID      Message2,
-	  IN ULONG      cbMessage2,
+DoUnwrapEx( IN PPROTOCOL_CALLBACK_ARGS pArgs,
+	    IN PHCTXT                  phContext,
+	    IN ULONG                   Flags,
+	    IN ULONG                   SeqNo,
 
-	  OUT PVOID     *ppvHeader,
-	  OUT PULONG    pcbHeader,
-	  OUT PVOID     *ppvCrypt,
-	  OUT PULONG    pcbCrypt,
-	  OUT PVOID     *ppvPad,
-	  OUT PULONG    pcbPad,
-	  OUT PVOID     *ppvTrailer,
-	  OUT PULONG    pcbTrailer );
+	    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 );
+
 typedef ULONG (CHPWD_FUNCTION)( IN PPROTOCOL_CALLBACK_ARGS,  /* pArgs */
                                 IN LPSTR,  /* Principal */ 
                                 IN LPSTR,  /* Old Password */