Use RFC 5587 const types for draft-josefsson-gss-capsulate APIs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24821 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h
index 4ad0a54f6f7c3deb5524b3556ba3dbc3256ff6a0..318bf7daf5b724d3561bf3b1d65100083a3e9549 100644 (file)
--- a/src/lib/gssapi/generic/gssapi_ext.h
+++ b/src/lib/gssapi/generic/gssapi_ext.h
@@ -386,22 +386,22 @@ OM_uint32 KRB5_CALLCONV gss_release_any_name_mapping
 /* draft-josefsson-gss-capsulate */
 OM_uint32 KRB5_CALLCONV gss_encapsulate_token
 (
-    const gss_buffer_t, /* input_token */
-    const gss_OID,      /* token_oid */
-    const gss_buffer_t  /* output_token */
+    gss_const_buffer_t, /* input_token */
+    gss_const_OID,      /* token_oid */
+    gss_buffer_t        /* output_token */
 );
 
 OM_uint32 KRB5_CALLCONV gss_decapsulate_token
 (
-    const gss_buffer_t, /* input_token */
-    const gss_OID,      /* token_oid */
+    gss_const_buffer_t, /* input_token */
+    gss_const_OID,      /* token_oid */
     gss_buffer_t        /* output_token */
 );
 
 int KRB5_CALLCONV gss_oid_equal
 (
-    const gss_OID,      /* first_oid */
-    const gss_OID       /* second_oid */
+    gss_const_OID,      /* first_oid */
+    gss_const_OID       /* second_oid */
 );
 
 #ifdef __cplusplus

diff --git a/src/lib/gssapi/mechglue/g_decapsulate_token.c b/src/lib/gssapi/mechglue/g_decapsulate_token.c
index a12d8f7eccc2fcbc22f6a15898890271412aeebe..42b9e0798424f2ce776e40ee3551bce8370bf44d 100644 (file)
--- a/src/lib/gssapi/mechglue/g_decapsulate_token.c
+++ b/src/lib/gssapi/mechglue/g_decapsulate_token.c
@@ -33,8 +33,8 @@
 #include "mglueP.h"
 
 OM_uint32
-gss_decapsulate_token(const gss_buffer_t input_token,
-                      const gss_OID token_oid,
+gss_decapsulate_token(gss_const_buffer_t input_token,
+                      gss_const_OID token_oid,
                       gss_buffer_t output_token)
 {
     OM_uint32 minor;

diff --git a/src/lib/gssapi/mechglue/g_encapsulate_token.c b/src/lib/gssapi/mechglue/g_encapsulate_token.c
index a60c796e1bca8135884e0a65cc6da55aad4121d7..b26e14704861755bedfc1827a84e5e8139f6901c 100644 (file)
--- a/src/lib/gssapi/mechglue/g_encapsulate_token.c
+++ b/src/lib/gssapi/mechglue/g_encapsulate_token.c
@@ -33,8 +33,8 @@
 #include "mglueP.h"
 
 OM_uint32
-gss_encapsulate_token(const gss_buffer_t input_token,
-                      const gss_OID token_oid,
+gss_encapsulate_token(gss_const_buffer_t input_token,
+                      gss_const_OID token_oid,
                       gss_buffer_t output_token)
 {
     unsigned int tokenSize;

diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
index e7251672b2c9d899bb36d1d68be097a253b9dffc..d750368ead020365d5e1e4a275b3ce7f898d3fdf 100644 (file)
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -105,8 +105,8 @@ gssint_copy_oid_set(
 
 int
 gss_oid_equal(
-    const gss_OID first_oid,
-    const gss_OID second_oid)
+    gss_const_OID first_oid,
+    gss_const_OID second_oid)
 {
     return g_OID_equal(first_oid, second_oid);
 }