diff options
author | Greg Hudson <ghudson@mit.edu> | 2013-06-07 15:17:31 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2013-06-07 15:19:37 -0400 |
commit | e51c089b745161dd6e1d64998e99d065fc22377e (patch) | |
tree | 5e792dd53ed48f3c5d0a0aa78c0ce8e777f385a2 /src/lib/gssapi | |
parent | 4f551a7ec126c52ee1f8fea4c3954015b70987bd (diff) | |
download | krb5-e51c089b745161dd6e1d64998e99d065fc22377e.tar.gz krb5-e51c089b745161dd6e1d64998e99d065fc22377e.tar.xz krb5-e51c089b745161dd6e1d64998e99d065fc22377e.zip |
Fix various warnings
Diffstat (limited to 'src/lib/gssapi')
-rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 2 | ||||
-rw-r--r-- | src/lib/gssapi/krb5/gssapi_krb5.c | 3 | ||||
-rw-r--r-- | src/lib/gssapi/spnego/spnego_mech.c | 10 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index ae55297d0f..42ac1226bc 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -441,7 +441,6 @@ kg_accept_krb5(minor_status, context_handle, char *sptr; OM_uint32 tmp; size_t md5len; - int bigend; krb5_gss_cred_id_t cred = 0; krb5_data ap_rep, ap_req; unsigned int i; @@ -698,7 +697,6 @@ kg_accept_krb5(minor_status, context_handle, } gss_flags = GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG; - bigend = 0; decode_req_message = 0; } else { /* gss krb5 v1 */ diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index 04d70a64b6..a1bb92dc05 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -405,7 +405,6 @@ krb5_gss_inquire_cred_by_oid(OM_uint32 *minor_status, gss_buffer_set_t *data_set) { OM_uint32 major_status = GSS_S_FAILURE; - krb5_gss_cred_id_t cred; #if 0 size_t i; #endif @@ -431,8 +430,6 @@ krb5_gss_inquire_cred_by_oid(OM_uint32 *minor_status, if (GSS_ERROR(major_status)) return major_status; - cred = (krb5_gss_cred_id_t) cred_handle; - #if 0 for (i = 0; i < sizeof(krb5_gss_inquire_cred_by_oid_ops)/ sizeof(krb5_gss_inquire_cred_by_oid_ops[0]); i++) { diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 81f7a3ab9c..33c8c88080 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -1124,7 +1124,6 @@ make_NegHints(OM_uint32 *minor_status, OM_uint32 minor; unsigned int tlen = 0; unsigned int hintNameSize = 0; - unsigned int negHintsSize = 0; unsigned char *ptr; unsigned char *t; @@ -1208,7 +1207,6 @@ make_NegHints(OM_uint32 *minor_status, /* Length of DER encoded hintName */ tlen += 1 + gssint_der_length_size(hintNameSize); - negHintsSize = tlen; t = gssalloc_malloc(tlen); if (t == NULL) { @@ -1619,7 +1617,6 @@ spnego_gss_accept_sec_context( gss_buffer_desc mechtok_out = GSS_C_EMPTY_BUFFER; spnego_gss_ctx_id_t sc = NULL; spnego_gss_cred_id_t spcred = NULL; - OM_uint32 mechstat = GSS_S_FAILURE; int sendTokenInit = 0, tmpret; mechtok_in = mic_in = mic_out = GSS_C_NO_BUFFER; @@ -1718,15 +1715,12 @@ spnego_gss_accept_sec_context( * round-trip. RET is set to a default value according to * whether it is the first round-trip. */ - mechstat = GSS_S_FAILURE; if (negState != REQUEST_MIC && mechtok_in != GSS_C_NO_BUFFER) { ret = acc_ctx_call_acc(minor_status, sc, spcred, mechtok_in, mech_type, &mechtok_out, ret_flags, time_rec, delegated_cred_handle, &negState, &return_token); - } else if (negState == REQUEST_MIC) { - mechstat = GSS_S_CONTINUE_NEEDED; } /* Step 3: process or generate the MIC, if the negotiated mech is @@ -4008,10 +4002,10 @@ g_verify_neg_token_init(unsigned char **buf_in, unsigned int cur_size) * - check for a0(context specific identifier) * - get length and verify that enoughd ata exists */ - if (g_get_tag_and_length(&buf, CONTEXT, cur_size, &seqsize) < 0) + if (g_get_tag_and_length(&buf, CONTEXT, cur_size, &bytes) < 0) return (G_BAD_TOK_HEADER); - cur_size = seqsize; /* should indicate bytes remaining */ + cur_size = bytes; /* should indicate bytes remaining */ /* * Verify the next piece, it should identify this as |