Changed GSSAPI opaque types (gss_name_t, gss_cred_id_t, gss_ctx_id_t) from

void* to pointers to opaque structs.  This change removed some casts and
introduced or changed a bunch of other casts to suppress warnings.

krb5_gss_accept_sec_context(): Fixed a bug found by the above changes
where krb5_gss_release_cred() was being called with the wrong argument 2
(gss_cred_id_t instead of gss_cred_id_t*).

ticket: 4057
status: open

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

diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 28b5b1123700b27ed6047b78bc39f7e1eba37aa6..71b365b0b0495d7702383e14a42197653a90ecf7 100644 (file)
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -69,9 +69,14 @@ extern "C" {
  * First, define the three platform-dependent pointer types.
  */
 
-typedef void * gss_name_t;
-typedef void * gss_cred_id_t;
-typedef void * gss_ctx_id_t;
+struct gss_name_struct;
+typedef struct gss_name_struct * gss_name_t;
+
+struct gss_cred_id_struct;
+typedef struct gss_cred_id_struct * gss_cred_id_t;
+
+struct gss_ctx_id_struct;
+typedef struct gss_ctx_id_struct * gss_ctx_id_t;
 
 /*
  * The following type must be defined as the smallest natural unsigned integer

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 2752f1dfa1ad8294141e74ea5140037e04e96e8d..e34055b6ce7e1971462a0d6dd5dca3f387e54587 100644 (file)
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -150,19 +150,19 @@ int g_set_entry_add (g_set_elt *s, void *key, void *value);
 int g_set_entry_delete (g_set_elt *s, void *key);
 int g_set_entry_get (g_set_elt *s, void *key, void **value);
 
-int g_save_name (g_set *vdb, gss_name_t *name);
-int g_save_cred_id (g_set *vdb, gss_cred_id_t *cred);
-int g_save_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_save_name (g_set *vdb, gss_name_t name);
+int g_save_cred_id (g_set *vdb, gss_cred_id_t cred);
+int g_save_ctx_id (g_set *vdb, gss_ctx_id_t ctx);
 int g_save_lucidctx_id (g_set *vdb, void *lctx);
 
-int g_validate_name (g_set *vdb, gss_name_t *name);
-int g_validate_cred_id (g_set *vdb, gss_cred_id_t *cred);
-int g_validate_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_validate_name (g_set *vdb, gss_name_t name);
+int g_validate_cred_id (g_set *vdb, gss_cred_id_t cred);
+int g_validate_ctx_id (g_set *vdb, gss_ctx_id_t ctx);
 int g_validate_lucidctx_id (g_set *vdb, void *lctx);
 
-int g_delete_name (g_set *vdb, gss_name_t *name);
-int g_delete_cred_id (g_set *vdb, gss_cred_id_t *cred);
-int g_delete_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_delete_name (g_set *vdb, gss_name_t name);
+int g_delete_cred_id (g_set *vdb, gss_cred_id_t cred);
+int g_delete_ctx_id (g_set *vdb, gss_ctx_id_t ctx);
 int g_delete_lucidctx_id (g_set *vdb, void *lctx);
 
 int g_make_string_buffer (const char *str, gss_buffer_t buffer);

diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c
index fedbab158b058b0b8b8e10b5441a9a7804f45f24..aa91237d1f6925e05be435b6b2233728be08820b 100644 (file)
--- a/src/lib/gssapi/generic/util_validate.c
+++ b/src/lib/gssapi/generic/util_validate.c
@@ -240,19 +240,19 @@ static int g_delete(db, type, ptr)
 
 int g_save_name(vdb, name)
      g_set *vdb;
-     gss_name_t *name;
+     gss_name_t name;
 {
    return(g_save(vdb, V_NAME, (void *) name));
 }
 int g_save_cred_id(vdb, cred)
      g_set *vdb;
-     gss_cred_id_t *cred;
+     gss_cred_id_t cred;
 {
    return(g_save(vdb, V_CRED_ID, (void *) cred));
 }
 int g_save_ctx_id(vdb, ctx)
      g_set *vdb;
-     gss_ctx_id_t *ctx;
+     gss_ctx_id_t ctx;
 {
    return(g_save(vdb, V_CTX_ID, (void *) ctx));
 }
@@ -268,19 +268,19 @@ int g_save_lucidctx_id(vdb, lctx)
 
 int g_validate_name(vdb, name)
      g_set *vdb;
-     gss_name_t *name;
+     gss_name_t name;
 {
    return(g_validate(vdb, V_NAME, (void *) name));
 }
 int g_validate_cred_id(vdb, cred)
      g_set *vdb;
-     gss_cred_id_t *cred;
+     gss_cred_id_t cred;
 {
    return(g_validate(vdb, V_CRED_ID, (void *) cred));
 }
 int g_validate_ctx_id(vdb, ctx)
      g_set *vdb;
-     gss_ctx_id_t *ctx;
+     gss_ctx_id_t ctx;
 {
    return(g_validate(vdb, V_CTX_ID, (void *) ctx));
 }
@@ -295,19 +295,19 @@ int g_validate_lucidctx_id(vdb, lctx)
 
 int g_delete_name(vdb, name)
      g_set *vdb;
-     gss_name_t *name;
+     gss_name_t name;
 {
    return(g_delete(vdb, V_NAME, (void *) name));
 }
 int g_delete_cred_id(vdb, cred)
      g_set *vdb;
-     gss_cred_id_t *cred;
+     gss_cred_id_t cred;
 {
    return(g_delete(vdb, V_CRED_ID, (void *) cred));
 }
 int g_delete_ctx_id(vdb, ctx)
      g_set *vdb;
-     gss_ctx_id_t *ctx;
+     gss_ctx_id_t ctx;
 {
    return(g_delete(vdb, V_CTX_ID, (void *) ctx));
 }

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index f461e8d501c3a37e72fe390a6dabb596668a07b9..ed4c3e22159dc3175735c8c97e09bf07c0d3a9f6 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -874,7 +874,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
    if (ret_flags)
       *ret_flags = ctx->gss_flags;
 
-   *context_handle = ctx;
+   *context_handle = (gss_ctx_id_t)ctx;
    *output_token = token;
 
    if (src_name)
@@ -1000,7 +1000,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
        *output_token = token;
    }
    if (!verifier_cred_handle && cred_handle) {
-          krb5_gss_release_cred(minor_status, cred_handle);
+          krb5_gss_release_cred(minor_status, &cred_handle);
    }
    krb5_free_context(context);
    return (major_status);

diff --git a/src/lib/gssapi/krb5/add_cred.c b/src/lib/gssapi/krb5/add_cred.c
index 6bcc2d1c9f2c9247d7c052d5f47d230f32a92b12..225f125d229c227cdb1a869f4074c248635c9389 100644 (file)
--- a/src/lib/gssapi/krb5/add_cred.c
+++ b/src/lib/gssapi/krb5/add_cred.c
@@ -342,7 +342,8 @@ krb5_gss_add_cred(minor_status, input_cred_handle,
 
     /* set the outputs */
 
-    if (GSS_ERROR(major_status = krb5_gss_inquire_cred(minor_status, cred,
+    if (GSS_ERROR(major_status = krb5_gss_inquire_cred(minor_status, 
+                                                      (gss_cred_id_t)cred,
                                                       NULL, &lifetime,
                                                       NULL, actual_mechs))) {
        OM_uint32 dummy;
@@ -360,7 +361,7 @@ krb5_gss_add_cred(minor_status, input_cred_handle,
        *acceptor_time_rec = lifetime;
 
     if (output_cred_handle)
-       *output_cred_handle = cred;
+       *output_cred_handle = (gss_cred_id_t)cred;
 
     krb5_free_context(context);
     *minor_status = 0;

diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c
index be91cd0787f3a23cc3e80ca512d35aa96c8f4256..1bc6799e335c8c6e21fd7dcbc280f677ab2df253 100644 (file)
--- a/src/lib/gssapi/krb5/delete_sec_context.c
+++ b/src/lib/gssapi/krb5/delete_sec_context.c
@@ -53,7 +53,7 @@ krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
       return(GSS_S_NO_CONTEXT);
    }
 
-   ctx = (gss_ctx_id_t) *context_handle;
+   ctx = (krb5_gss_ctx_id_t) *context_handle;
    context = ctx->k5_context;
 
    /* construct a delete context token if necessary */

diff --git a/src/lib/gssapi/krb5/duplicate_name.c b/src/lib/gssapi/krb5/duplicate_name.c
index a827717649d7485da0cad6cb77e40deaa92e5399..cb2ca71c7dd15efd1b073b1b8640b48fcc9df2e7 100644 (file)
--- a/src/lib/gssapi/krb5/duplicate_name.c
+++ b/src/lib/gssapi/krb5/duplicate_name.c
@@ -52,7 +52,7 @@ OM_uint32 krb5_gss_duplicate_name(OM_uint32  *minor_status,
                return(GSS_S_CALL_BAD_STRUCTURE|GSS_S_BAD_NAME);
        }
 
-       princ = input_name;
+       princ = (krb5_principal)input_name;
        if ((code = krb5_copy_principal(context, princ, &outprinc))) {
                *minor_status = code;
                krb5_free_context(context);

diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 81b49f2c73c90327255f5104b6d4d9f64dbb631f..dff47747072d1873386e0b69dd1c21b55b83a1e4 100644 (file)
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -688,7 +688,7 @@ mutual_auth(
       return(GSS_S_NO_CONTEXT);
    }
 
-   ctx = (gss_ctx_id_t) *context_handle;
+   ctx = (krb5_gss_ctx_id_t) *context_handle;
 
    /* make sure the context is non-established, and that certain
       arguments are unchanged */
@@ -878,7 +878,7 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
    /* verify the credential, or use the default */
    /*SUPPRESS 29*/
    if (claimant_cred_handle == GSS_C_NO_CREDENTIAL) {
-      major_status = kg_get_defcred(minor_status, &cred);
+      major_status = kg_get_defcred(minor_status, (gss_cred_id_t *)&cred);
       if (major_status && GSS_ERROR(major_status)) {
         if (*context_handle == GSS_C_NO_CONTEXT)
            krb5_free_context(context);
@@ -928,7 +928,7 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
    if (err) {
       k5_mutex_unlock(&cred->lock);
       if (claimant_cred_handle == GSS_C_NO_CREDENTIAL)
-        krb5_gss_release_cred(minor_status, (gss_cred_id_t)&cred);
+        krb5_gss_release_cred(minor_status, (gss_cred_id_t *)&cred);
       *minor_status = 0;
       if (*context_handle == GSS_C_NO_CONTEXT)
         krb5_free_context(context);
@@ -965,7 +965,7 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
    }
 
    if (claimant_cred_handle == GSS_C_NO_CREDENTIAL)
-      krb5_gss_release_cred(&tmp_min_stat, (gss_cred_id_t)&cred);
+      krb5_gss_release_cred(&tmp_min_stat, (gss_cred_id_t *)&cred);
 
    return(major_status);
 }

diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
index 1f61384e9faed3ead5d857550ac1e20471820df3..58425d80d709e5f9f44d866f82a2ebf539f0de29 100644 (file)
--- a/src/lib/gssapi/krb5/inq_cred.c
+++ b/src/lib/gssapi/krb5/inq_cred.c
@@ -108,7 +108,7 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
    if (cred_handle == GSS_C_NO_CREDENTIAL) {
       OM_uint32 major;
 
-      if ((major = kg_get_defcred(minor_status, (gss_cred_id_t)&cred)) &&
+      if ((major = kg_get_defcred(minor_status, (gss_cred_id_t *)&cred)) &&
          GSS_ERROR(major)) {
         krb5_free_context(context);
         return(major);
@@ -176,7 +176,7 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
       if (ret_name != NULL && ! kg_save_name((gss_name_t) ret_name)) {
         k5_mutex_unlock(&cred->lock);
         if (cred_handle == GSS_C_NO_CREDENTIAL)
-            krb5_gss_release_cred(minor_status, (gss_cred_id_t)&cred);
+            krb5_gss_release_cred(minor_status, (gss_cred_id_t *)&cred);
 
         (void) gss_release_oid_set(minor_status, &mechs);
         krb5_free_principal(context, ret_name);
@@ -201,7 +201,7 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
       *mechanisms = mechs;
 
    if (cred_handle == GSS_C_NO_CREDENTIAL)
-       krb5_gss_release_cred(minor_status, (gss_cred_id_t)&cred);
+       krb5_gss_release_cred(minor_status, (gss_cred_id_t *)&cred);
 
    krb5_free_context(context);
    *minor_status = 0;
@@ -210,7 +210,7 @@ fail:
    if (cred_handle == GSS_C_NO_CREDENTIAL) {
        OM_uint32 tmp_min_stat;
 
-       krb5_gss_release_cred(&tmp_min_stat, (gss_cred_id_t)&cred);
+       krb5_gss_release_cred(&tmp_min_stat, (gss_cred_id_t *)&cred);
    }
    krb5_free_context(context);
    return ret;

diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c
index f1bf5c53797d6ef2a3ed86df06ca7a7f69f14d5a..49d8ec3f9fdb31a656d023f5a48ae9e844b7cf47 100644 (file)
--- a/src/lib/gssapi/krb5/process_context_token.c
+++ b/src/lib/gssapi/krb5/process_context_token.c
@@ -42,7 +42,7 @@ krb5_gss_process_context_token(minor_status, context_handle,
       return(GSS_S_NO_CONTEXT);
    }
 
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
+   ctx = (krb5_gss_ctx_id_t) context_handle;
 
    if (! ctx->established) {
       *minor_status = KG_CTX_INCOMPLETE;
@@ -51,7 +51,8 @@ krb5_gss_process_context_token(minor_status, context_handle,
 
    /* "unseal" the token */
 
-   if (GSS_ERROR(majerr = kg_unseal(minor_status, ctx, token_buffer,
+   if (GSS_ERROR(majerr = kg_unseal(minor_status, context_handle, 
+                                    token_buffer,
                                    GSS_C_NO_BUFFER, NULL, NULL,
                                    KG_TOK_DEL_CTX)))
       return(majerr);

diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c
index e48656f9f3dceac2c5ffc07fc8aa055f5da85646..416d51a9e35e56ac6d5b0fdb770919e453c416b5 100644 (file)
--- a/src/lib/gssapi/krb5/rel_cred.c
+++ b/src/lib/gssapi/krb5/rel_cred.c
@@ -49,7 +49,7 @@ krb5_gss_release_cred(minor_status, cred_handle)
       return(GSS_S_CALL_BAD_STRUCTURE|GSS_S_NO_CRED);
    }
 
-   cred = *cred_handle;
+   cred = (krb5_gss_cred_id_t)*cred_handle;
 
    k5_mutex_destroy(&cred->lock);
    /* ignore error destroying mutex */

diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
index 030fbfdfa571cdb06422d804f76ea2ba9aefa0e2..c9c48dce06956c8d03e27c7eb1b890364f145643 100644 (file)
--- a/src/lib/gssapi/mechglue/g_glue.c
+++ b/src/lib/gssapi/mechglue/g_glue.c
@@ -492,7 +492,7 @@ OM_uint32 gssint_convert_name_to_union_name(minor_status, mech,
     if (major_status != GSS_S_COMPLETE)
        goto allocation_failure;
 
-    *external_name =  union_name;
+    *external_name = /*(gss_name_t) CHECK */union_name;
     return (GSS_S_COMPLETE);
 
 allocation_failure:

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 2becac9608bcd2f6d27672a10bcce747f0ed0c63..07ef7109ea4bf8b1981592443cafc3adde8f7c8d 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -26,7 +26,7 @@ do {                                                          \
 /*
  * Array of context IDs typed by mechanism OID
  */
-typedef struct gss_union_ctx_id_t {
+typedef struct gss_ctx_id_struct {
        gss_OID                 mech_type;
        gss_ctx_id_t            internal_ctx_id;
 } gss_union_ctx_id_desc, *gss_union_ctx_id_t;
@@ -35,7 +35,7 @@ typedef struct gss_union_ctx_id_t {
  * Generic GSSAPI names.  A name can either be a generic name, or a
  * mechanism specific name....
  */
-typedef struct gss_union_name_t {
+typedef struct gss_name_struct {
        gss_OID                 name_type;
        gss_buffer_t            external_name;
        /*
@@ -69,7 +69,7 @@ typedef struct gss_union_cred_auxinfo {
 /*
  * Set of Credentials typed on mechanism OID
  */
-typedef struct gss_union_cred_t {
+typedef struct gss_cred_id_struct {
        int                     count;
        gss_OID                 mechs_array;
        gss_cred_id_t           *cred_array;