diff options
author | Ken Raeburn <raeburn@mit.edu> | 2008-08-27 16:36:00 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2008-08-27 16:36:00 +0000 |
commit | 8acb29c6f3259749c85985c2df6b0cbd870c52f6 (patch) | |
tree | 0a79e57cf8714e3a10df69586ce445abe7c36a31 /src/lib/gssapi/mechglue | |
parent | 6f207872f88b0c63e0ec81041f8c54b6b68f73f5 (diff) | |
download | krb5-8acb29c6f3259749c85985c2df6b0cbd870c52f6.zip krb5-8acb29c6f3259749c85985c2df6b0cbd870c52f6.tar.gz krb5-8acb29c6f3259749c85985c2df6b0cbd870c52f6.tar.bz2 |
Based on patch from lxs, with some changes:
Add several new gcc warning flags, used in the KfM build process.
Put declarations before code.
Fix a bunch of signed/unsigned type mixes, mostly by changing variable
types to unsigned int.
Fix constness in handling name of default ccache name.
Make sure functions get declared with prototypes:
krb5int_pthread_loaded krb5int_gmt_mktime krb5int_aes_encrypt
krb5int_aes_decrypt gssint_mecherrmap_init gssint_mecherramp_get.
Don't shadow global names: stat accept index open encrypt. Fix
variable shadowing in LDAP ASN.1 support.
Don't define unused krb5int_local_addresses.
Don't export internal krb5_change_set_password.
Fix error return indications from gssint_oid_to_mech.
Create and use k5-gmt_mktime.h to provide one global declaration of
krb5int_gmt_mktime, needed before we've generated krb5.h on some
platforms.
Not incorporated from initial patch: const changes in function
signatures.
ticket: 6096
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20697 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/mechglue')
-rw-r--r-- | src/lib/gssapi/mechglue/g_acquire_cred.c | 2 | ||||
-rw-r--r-- | src/lib/gssapi/mechglue/g_initialize.c | 10 | ||||
-rw-r--r-- | src/lib/gssapi/mechglue/g_inq_context.c | 36 | ||||
-rw-r--r-- | src/lib/gssapi/mechglue/g_rel_oid_set.c | 8 | ||||
-rw-r--r-- | src/lib/gssapi/mechglue/mglueP.h | 5 | ||||
-rw-r--r-- | src/lib/gssapi/mechglue/oid_ops.c | 20 |
6 files changed, 36 insertions, 45 deletions
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c index fbe6668..f2e8cd1 100644 --- a/src/lib/gssapi/mechglue/g_acquire_cred.c +++ b/src/lib/gssapi/mechglue/g_acquire_cred.c @@ -145,7 +145,7 @@ OM_uint32 * time_rec; gss_OID_set mechs; gss_OID_desc default_OID; gss_mechanism mech; - int i; + unsigned int i; gss_union_cred_t creds; major = val_acq_cred_args(minor_status, diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c index 518eeed..f2f1226 100644 --- a/src/lib/gssapi/mechglue/g_initialize.c +++ b/src/lib/gssapi/mechglue/g_initialize.c @@ -146,7 +146,7 @@ gss_indicate_mechs(minorStatus, mechSet) OM_uint32 *minorStatus; gss_OID_set *mechSet; { - int i, j; + unsigned int i, j; gss_OID curItem; /* Initialize outputs. */ @@ -232,7 +232,7 @@ gss_OID_set *mechSet; static void free_mechSet(void) { - int i; + unsigned int i; if (g_mechSet.count != 0) { for (i = 0; i < g_mechSet.count; i++) @@ -415,7 +415,7 @@ gssint_oid_to_mech(const gss_OID oid) /* ensure we have fresh data */ if (k5_mutex_lock(&g_mechListLock) != 0) - return GSS_S_FAILURE; + return NULL; updateMechList(); aMech = searchMechList(oid); (void) k5_mutex_unlock(&g_mechListLock); @@ -539,8 +539,6 @@ register_mech(gss_mechanism mech, const char *namestr, void *dl_handle) static void init_hardcoded(void) { - extern gss_mechanism *krb5_gss_get_mech_configs(void); - extern gss_mechanism *spnego_gss_get_mech_configs(void); gss_mechanism *cflist; static int inited; @@ -579,7 +577,7 @@ gssint_get_mechanism(gss_OID oid) return NULL; if (k5_mutex_lock(&g_mechListLock) != 0) - return GSS_S_FAILURE; + return NULL; /* check if the mechanism is already loaded */ if ((aMech = searchMechList(oid)) != NULL && aMech->mech) { (void) k5_mutex_unlock(&g_mechListLock); diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c index a473834..201c8bb 100644 --- a/src/lib/gssapi/mechglue/g_inq_context.c +++ b/src/lib/gssapi/mechglue/g_inq_context.c @@ -41,7 +41,7 @@ val_inq_ctx_args( gss_OID *mech_type, OM_uint32 *ctx_flags, int *locally_initiated, - int *open) + int *opened) { /* Initialize outputs. */ @@ -73,27 +73,15 @@ val_inq_ctx_args( /* Last argument new for V2 */ OM_uint32 KRB5_CALLCONV gss_inquire_context( - minor_status, - context_handle, - src_name, - targ_name, - lifetime_rec, - mech_type, - ctx_flags, - locally_initiated, - open) - -OM_uint32 * minor_status; -gss_ctx_id_t context_handle; -gss_name_t * src_name; -gss_name_t * targ_name; -OM_uint32 * lifetime_rec; -gss_OID * mech_type; -OM_uint32 * ctx_flags; -int * locally_initiated; -int * open; - - + OM_uint32 *minor_status, + gss_ctx_id_t context_handle, + gss_name_t *src_name, + gss_name_t *targ_name, + OM_uint32 *lifetime_rec, + gss_OID *mech_type, + OM_uint32 *ctx_flags, + int *locally_initiated, + int *opened) { gss_union_ctx_id_t ctx; gss_mechanism mech; @@ -105,7 +93,7 @@ int * open; src_name, targ_name, lifetime_rec, mech_type, ctx_flags, - locally_initiated, open); + locally_initiated, opened); if (status != GSS_S_COMPLETE) return (status); @@ -132,7 +120,7 @@ int * open; NULL, ctx_flags, locally_initiated, - open); + opened); if (status != GSS_S_COMPLETE) { map_error(minor_status, mech); diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c index f712a89..f55c907 100644 --- a/src/lib/gssapi/mechglue/g_rel_oid_set.c +++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c @@ -39,19 +39,19 @@ gss_release_oid_set (minor_status, OM_uint32 * minor_status; gss_OID_set * set; { - OM_uint32 index; + OM_uint32 i; gss_OID oid; if (minor_status) *minor_status = 0; - if (set ==NULL) + if (set == NULL) return GSS_S_COMPLETE; if (*set == GSS_C_NULL_OID_SET) return(GSS_S_COMPLETE); - for (index=0; index<(*set)->count; index++) { - oid = &(*set)->elements[index]; + for (i=0; i<(*set)->count; i++) { + oid = &(*set)->elements[i]; free(oid->elements); } free((*set)->elements); diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h index a2470fb..1f14ee2 100644 --- a/src/lib/gssapi/mechglue/mglueP.h +++ b/src/lib/gssapi/mechglue/mglueP.h @@ -390,6 +390,11 @@ typedef struct gss_mech_config { struct gss_mech_config *next; /* next element in the list */ } *gss_mech_info; +/* Mechanisms defined within our library */ + +extern gss_mechanism *krb5_gss_get_mech_configs(void); +extern gss_mechanism *spnego_gss_get_mech_configs(void); + /********************************************************/ /* Internal mechglue routines */ diff --git a/src/lib/gssapi/mechglue/oid_ops.c b/src/lib/gssapi/mechglue/oid_ops.c index 4a79028..11a5099 100644 --- a/src/lib/gssapi/mechglue/oid_ops.c +++ b/src/lib/gssapi/mechglue/oid_ops.c @@ -310,7 +310,7 @@ generic_gss_str_to_oid(minor_status, oid_str, oid) long numbuf; long onumbuf; OM_uint32 nbytes; - int index; + int i; unsigned char *op; if (minor_status != NULL) @@ -412,12 +412,12 @@ generic_gss_str_to_oid(minor_status, oid_str, oid) } numbuf = onumbuf; op += nbytes; - index = -1; + i = -1; while (numbuf) { - op[index] = (unsigned char) numbuf & 0x7f; - if (index != -1) - op[index] |= 0x80; - index--; + op[i] = (unsigned char) numbuf & 0x7f; + if (i != -1) + op[i] |= 0x80; + i--; numbuf >>= 7; } while (isdigit(*bp)) @@ -466,7 +466,7 @@ gssint_copy_oid_set( gss_OID_set_desc *copy; OM_uint32 minor = 0; OM_uint32 major = GSS_S_COMPLETE; - OM_uint32 index; + OM_uint32 i; if (minor_status != NULL) *minor_status = 0; @@ -492,9 +492,9 @@ gssint_copy_oid_set( } copy->count = oidset->count; - for (index = 0; index < copy->count; index++) { - gss_OID_desc *out = ©->elements[index]; - gss_OID_desc *in = &oidset->elements[index]; + for (i = 0; i < copy->count; i++) { + gss_OID_desc *out = ©->elements[i]; + gss_OID_desc *in = &oidset->elements[i]; if ((out->elements = (void *) malloc(in->length)) == NULL) { major = GSS_S_FAILURE; |