Wrap gss_seal/gss_unseal (V1) on gss_wrap/gss_unrwap (V2), rather than

the other way around. Mechanisms should export V2 interfaces.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mskrb-integ@21646 dc483132-0cff-0310-8789-dd5450dbe970

10 files changed, 43 insertions, 95 deletions

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index e21cd64..30d64fe 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -547,25 +547,6 @@ OM_uint32 krb5_gss_verify
  int*              /* qop_state */
 );
 
-OM_uint32 krb5_gss_seal
-(OM_uint32*,       /* minor_status */
- gss_ctx_id_t,     /* context_handle */
- int,              /* conf_req_flag */
- int,              /* qop_req */
- gss_buffer_t,     /* input_message_buffer */
- int*,             /* conf_state */
- gss_buffer_t      /* output_message_buffer */
-);
-
-OM_uint32 krb5_gss_unseal
-(OM_uint32*,       /* minor_status */
- gss_ctx_id_t,     /* context_handle */
- gss_buffer_t,     /* input_message_buffer */
- gss_buffer_t,     /* output_message_buffer */
- int*,             /* conf_state */
- int*              /* qop_state */
-);
-
 OM_uint32 krb5_gss_display_status
 (OM_uint32*,       /* minor_status */
  OM_uint32,        /* status_value */
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index ab23bb3..fa45c8b 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -386,8 +386,8 @@ static struct gss_config krb5_mechanism = {
     NULL,
     NULL,
 #else
-    krb5_gss_seal,
-    krb5_gss_unseal,
+    krb5_gss_wrap,
+    krb5_gss_unwrap,
 #endif
     krb5_gss_display_status,
     krb5_gss_indicate_mechs,
diff --git a/src/lib/gssapi/krb5/seal.c b/src/lib/gssapi/krb5/seal.c
index 77e0833..c7ed5ab 100644
--- a/src/lib/gssapi/krb5/seal.c
+++ b/src/lib/gssapi/krb5/seal.c
@@ -27,23 +27,6 @@
  * $Id$
  */
 
-OM_uint32
-krb5_gss_seal(minor_status, context_handle, conf_req_flag,
-              qop_req, input_message_buffer, conf_state,
-              output_message_buffer)
-    OM_uint32 *minor_status;
-    gss_ctx_id_t context_handle;
-    int conf_req_flag;
-    int qop_req;
-    gss_buffer_t input_message_buffer;
-    int *conf_state;
-    gss_buffer_t output_message_buffer;
-{
-    return(kg_seal(minor_status, context_handle, conf_req_flag,
-                   qop_req, input_message_buffer, conf_state,
-                   output_message_buffer, KG_TOK_SEAL_MSG));
-}
-
 /* V2 interface */
 OM_uint32
 krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
diff --git a/src/lib/gssapi/krb5/unseal.c b/src/lib/gssapi/krb5/unseal.c
index cf74924..1e42705 100644
--- a/src/lib/gssapi/krb5/unseal.c
+++ b/src/lib/gssapi/krb5/unseal.c
@@ -27,22 +27,6 @@
  * $Id$
  */
 
-OM_uint32
-krb5_gss_unseal(minor_status, context_handle,
-                input_message_buffer, output_message_buffer,
-                conf_state, qop_state)
-    OM_uint32 *minor_status;
-    gss_ctx_id_t context_handle;
-    gss_buffer_t input_message_buffer;
-    gss_buffer_t output_message_buffer;
-    int *conf_state;
-    int *qop_state;
-{
-    return(kg_unseal(minor_status, context_handle,
-                     input_message_buffer, output_message_buffer,
-                     conf_state, qop_state, KG_TOK_SEAL_MSG));
-}
-
 /* V2 interface */
 OM_uint32
 krb5_gss_unwrap(minor_status, context_handle,
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index abb54b3..6c47788 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -731,8 +731,8 @@ build_dynamicMech(void *dl, const gss_OID mech_type)
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_context_time);
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_sign);
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_verify);
-	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_seal);
-	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_unseal);
+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_wrap);
+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_unwrap);
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_display_status);
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_indicate_mechs);
 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_compare_name);
diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c
index 8f54b9d..9faa5dd 100644
--- a/src/lib/gssapi/mechglue/g_seal.c
+++ b/src/lib/gssapi/mechglue/g_seal.c
@@ -23,17 +23,17 @@
  */
 
 /*
- *  glue routine for gss_seal
+ *  glue routine for gss_wrap
  */
 
 #include "mglueP.h"
 
 static OM_uint32
-val_seal_args(
+val_wrap_args(
     OM_uint32 *minor_status,
     gss_ctx_id_t context_handle,
     int conf_req_flag,
-    int qop_req,
+    gss_qop_t qop_req,
     gss_buffer_t input_message_buffer,
     int *conf_state,
     gss_buffer_t output_message_buffer)
@@ -67,7 +67,7 @@ val_seal_args(
 }
 
 OM_uint32 KRB5_CALLCONV
-gss_seal (minor_status,
+gss_wrap (minor_status,
           context_handle,
           conf_req_flag,
           qop_req,
@@ -78,7 +78,7 @@ gss_seal (minor_status,
 OM_uint32 *		minor_status;
 gss_ctx_id_t		context_handle;
 int			conf_req_flag;
-int			qop_req;
+gss_qop_t		qop_req;
 gss_buffer_t		input_message_buffer;
 int *			conf_state;
 gss_buffer_t		output_message_buffer;
@@ -89,7 +89,7 @@ gss_buffer_t		output_message_buffer;
     gss_union_ctx_id_t	ctx;
     gss_mechanism	mech;
 
-    status = val_seal_args(minor_status, context_handle,
+    status = val_wrap_args(minor_status, context_handle,
 			   conf_req_flag, qop_req,
 			   input_message_buffer, conf_state,
 			   output_message_buffer);
@@ -105,8 +105,8 @@ gss_buffer_t		output_message_buffer;
     mech = gssint_get_mechanism (ctx->mech_type);
     
     if (mech) {
-	if (mech->gss_seal) {
-	    status = mech->gss_seal(
+	if (mech->gss_wrap) {
+	    status = mech->gss_wrap(
 				    minor_status,
 				    ctx->internal_ctx_id,
 				    conf_req_flag,
@@ -138,7 +138,7 @@ gss_buffer_t		output_message_buffer;
 }
 
 OM_uint32 KRB5_CALLCONV
-gss_wrap (minor_status,
+gss_seal (minor_status,
           context_handle,
           conf_req_flag,
           qop_req,
@@ -149,15 +149,15 @@ gss_wrap (minor_status,
 OM_uint32 *		minor_status;
 gss_ctx_id_t		context_handle;
 int			conf_req_flag;
-gss_qop_t		qop_req;
+int			qop_req;
 gss_buffer_t		input_message_buffer;
 int *			conf_state;
 gss_buffer_t		output_message_buffer;
 
 {
-    return gss_seal(minor_status, (gss_ctx_id_t)context_handle,
-		    conf_req_flag, (int) qop_req,
-		    (gss_buffer_t)input_message_buffer, conf_state,
+    return gss_wrap(minor_status, context_handle,
+		    conf_req_flag, (gss_qop_t) qop_req,
+		    input_message_buffer, conf_state,
 		    output_message_buffer);
 }
 
diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
index b120c81..c6b3350 100644
--- a/src/lib/gssapi/mechglue/g_unseal.c
+++ b/src/lib/gssapi/mechglue/g_unseal.c
@@ -23,13 +23,13 @@
  */
 
 /*
- *  glue routine gss_unseal
+ *  glue routine gss_unwrap
  */
 
 #include "mglueP.h"
 
 OM_uint32 KRB5_CALLCONV
-gss_unseal (minor_status,
+gss_unwrap (minor_status,
             context_handle,
             input_message_buffer,
             output_message_buffer,
@@ -41,7 +41,7 @@ gss_ctx_id_t		context_handle;
 gss_buffer_t		input_message_buffer;
 gss_buffer_t		output_message_buffer;
 int *			conf_state;
-int *			qop_state;
+gss_qop_t *		qop_state;
 
 {
 /* EXPORT DELETE START */
@@ -79,8 +79,8 @@ int *			qop_state;
     mech = gssint_get_mechanism (ctx->mech_type);
 
     if (mech) {
-	if (mech->gss_unseal) {
-	    status = mech->gss_unseal(minor_status,
+	if (mech->gss_unwrap) {
+	    status = mech->gss_unwrap(minor_status,
 				      ctx->internal_ctx_id,
 				      input_message_buffer,
 				      output_message_buffer,
@@ -109,7 +109,7 @@ int *			qop_state;
 }
 
 OM_uint32 KRB5_CALLCONV
-gss_unwrap (minor_status,
+gss_unseal (minor_status,
             context_handle,
             input_message_buffer,
             output_message_buffer,
@@ -121,10 +121,10 @@ gss_ctx_id_t		context_handle;
 gss_buffer_t		input_message_buffer;
 gss_buffer_t		output_message_buffer;
 int *			conf_state;
-gss_qop_t *		qop_state;
+int *			qop_state;
 
 {
-    return (gss_unseal(minor_status, (gss_ctx_id_t)context_handle,
-		       (gss_buffer_t)input_message_buffer,
-		       output_message_buffer, conf_state, (int *) qop_state));
+    return (gss_unwrap(minor_status, context_handle,
+		       input_message_buffer,
+		       output_message_buffer, conf_state, (gss_qop_t *) qop_state));
 }
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 00435d3..be2f229 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -200,24 +200,24 @@ typedef struct gss_config {
 		    gss_buffer_t,	/* token_buffer */
 		    int*		/* qop_state */
 		    );
-    OM_uint32       (*gss_seal)
+    OM_uint32       (*gss_wrap)
 	(
 		    OM_uint32*,		/* minor_status */
 		    gss_ctx_id_t,	/* context_handle */
 		    int,		/* conf_req_flag */
-		    int,		/* qop_req */
+		    gss_qop_t,		/* qop_req */
 		    gss_buffer_t,	/* input_message_buffer */
 		    int*,		/* conf_state */
 		    gss_buffer_t	/* output_message_buffer */
 		    );
-    OM_uint32       (*gss_unseal)
+    OM_uint32       (*gss_unwrap)
 	(
 		    OM_uint32*,		/* minor_status */
 		    gss_ctx_id_t,	/* context_handle */
 		    gss_buffer_t,	/* input_message_buffer */
 		    gss_buffer_t,	/* output_message_buffer */
 		    int*,		/* conf_state */
-		    int*		/* qop_state */
+		    gss_qop_t*		/* qop_state */
 		    );
     OM_uint32       (*gss_display_status)
 	(
diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
index 5b9eab3..1386460 100644
--- a/src/lib/gssapi/spnego/gssapiP_spnego.h
+++ b/src/lib/gssapi/spnego/gssapiP_spnego.h
@@ -225,22 +225,22 @@ OM_uint32 spnego_gss_inquire_names_for_mech
 	gss_OID_set *		/* name_types */
 );
 
-OM_uint32 spnego_gss_unseal
+OM_uint32 spnego_gss_unwrap
 (
 	OM_uint32 *minor_status,
 	gss_ctx_id_t context_handle,
 	gss_buffer_t input_message_buffer,
 	gss_buffer_t output_message_buffer,
 	int *conf_state,
-	int *qop_state
+	gss_qop_t *qop_state
 );
 
-OM_uint32 spnego_gss_seal
+OM_uint32 spnego_gss_wrap
 (
 	OM_uint32 *minor_status,
 	gss_ctx_id_t context_handle,
 	int conf_req_flag,
-	int qop_req,
+	gss_qop_t qop_req,
 	gss_buffer_t input_message_buffer,
 	int *conf_state,
 	gss_buffer_t output_message_buffer
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 9bc3847..12f0c34 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -223,8 +223,8 @@ static struct gss_config spnego_mechanism =
 	spnego_gss_context_time,	/* gss_context_time */
 	spnego_gss_sign,		/* gss_sign */
 	spnego_gss_verify,		/* gss_verify */
-	spnego_gss_seal,		/* gss_seal */
-	spnego_gss_unseal,		/* gss_unseal */
+	spnego_gss_wrap,		/* gss_wrap */
+	spnego_gss_unwrap,		/* gss_unwrap */
 	spnego_gss_display_status,
 	NULL,				/* gss_indicate_mechs */
 	spnego_gss_compare_name,
@@ -1863,16 +1863,16 @@ spnego_gss_inquire_names_for_mech(
 }
 
 OM_uint32
-spnego_gss_unseal(
+spnego_gss_unwrap(
 		OM_uint32 *minor_status,
 		gss_ctx_id_t context_handle,
 		gss_buffer_t input_message_buffer,
 		gss_buffer_t output_message_buffer,
 		int *conf_state,
-		int *qop_state)
+		gss_qop_t *qop_state)
 {
 	OM_uint32 ret;
-	ret = gss_unseal(minor_status,
+	ret = gss_unwrap(minor_status,
 			context_handle,
 			input_message_buffer,
 			output_message_buffer,
@@ -1883,17 +1883,17 @@ spnego_gss_unseal(
 }
 
 OM_uint32
-spnego_gss_seal(
+spnego_gss_wrap(
 		OM_uint32 *minor_status,
 		gss_ctx_id_t context_handle,
 		int conf_req_flag,
-		int qop_req,
+		gss_qop_t qop_req,
 		gss_buffer_t input_message_buffer,
 		int *conf_state,
 		gss_buffer_t output_message_buffer)
 {
 	OM_uint32 ret;
-	ret = gss_seal(minor_status,
+	ret = gss_wrap(minor_status,
 		    context_handle,
 		    conf_req_flag,
 		    qop_req,