diff options
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 6 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/ser_sctx.c | 14 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/util_crypt.c | 21 |
3 files changed, 21 insertions, 20 deletions
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index b6c216d58..ccfdb5c1c 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -988,9 +988,9 @@ kg_accept_krb5(minor_status, context_handle, if (ctx->proto == 0 && (ctx->gss_flags & GSS_C_DCE_STYLE) == 0 && (ap_req_options & AP_OPTS_USE_SUBKEY)) { - code = (*kaccess.krb5_auth_con_get_subkey_enctype) (context, - auth_context, - &negotiated_etype); + code = (*kaccess.auth_con_get_subkey_enctype)(context, + auth_context, + &negotiated_etype); if (code != 0) { major_status = GSS_S_FAILURE; goto fail; diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c index bdcd7685e..4987b2e9c 100644 --- a/src/lib/gssapi/krb5/ser_sctx.c +++ b/src/lib/gssapi/krb5/ser_sctx.c @@ -433,10 +433,10 @@ kg_ctx_externalize(kcontext, arg, buffer, lenremain) &bp, &remain); (void) krb5_ser_pack_int32((krb5_int32) ctx->krb_flags, &bp, &remain); - (void) (*kaccess.krb5_ser_pack_int64)((krb5_int64) ctx->seq_send, - &bp, &remain); - (void) (*kaccess.krb5_ser_pack_int64)((krb5_int64) ctx->seq_recv, - &bp, &remain); + (void) (*kaccess.ser_pack_int64)((krb5_int64) ctx->seq_send, + &bp, &remain); + (void) (*kaccess.ser_pack_int64)((krb5_int64) ctx->seq_recv, + &bp, &remain); /* Now dynamic data */ kret = 0; @@ -644,8 +644,10 @@ kg_ctx_internalize(kcontext, argp, buffer, lenremain) ctx->krb_times.renew_till = (krb5_timestamp) ibuf; (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); ctx->krb_flags = (krb5_flags) ibuf; - (void) (*kaccess.krb5_ser_unpack_int64)((krb5_int64 *)&ctx->seq_send, &bp, &remain); - kret = (*kaccess.krb5_ser_unpack_int64)((krb5_int64 *)&ctx->seq_recv, &bp, &remain); + (void) (*kaccess.ser_unpack_int64)((krb5_int64 *)&ctx->seq_send, + &bp, &remain); + kret = (*kaccess.ser_unpack_int64)((krb5_int64 *)&ctx->seq_recv, + &bp, &remain); if (kret) { free(ctx); return kret; diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c index 0f712ea46..e0970865b 100644 --- a/src/lib/gssapi/krb5/util_crypt.c +++ b/src/lib/gssapi/krb5/util_crypt.c @@ -119,9 +119,8 @@ kg_setup_keys(krb5_context context, krb5_gss_ctx_id_rec *ctx, krb5_key subkey, if (code != 0) return code; - code = (*kaccess.krb5int_c_mandatory_cksumtype)(context, - subkey->keyblock.enctype, - cksumtype); + code = (*kaccess.mandatory_cksumtype)(context, subkey->keyblock.enctype, + cksumtype); if (code != 0) return code; @@ -321,8 +320,8 @@ kg_arcfour_docrypt(const krb5_keyblock *longterm_key , int ms_usage, input.length = i; output.data = (void *) usage_key.contents; output.length = usage_key.length; - code = (*kaccess.krb5int_hmac) (kaccess.md5_hash_provider, - longterm_key, 1, &input, &output); + code = (*kaccess.hmac)(kaccess.md5_hash_provider, longterm_key, 1, + &input, &output); if (code) goto cleanup_arcfour; if (exportable) @@ -331,8 +330,8 @@ kg_arcfour_docrypt(const krb5_keyblock *longterm_key , int ms_usage, input.data = ( void *) kd_data; input.length = kd_data_len; output.data = (void *) seq_enc_key.contents; - code = (*kaccess.krb5int_hmac) (kaccess.md5_hash_provider, - &usage_key, 1, &input, &output); + code = (*kaccess.hmac)(kaccess.md5_hash_provider, &usage_key, 1, + &input, &output); if (code) goto cleanup_arcfour; input.data = ( void * ) input_buf; @@ -667,8 +666,8 @@ kg_arcfour_docrypt_iov(krb5_context context, input.length = i; output.data = (void *) usage_key.contents; output.length = usage_key.length; - code = (*kaccess.krb5int_hmac) (kaccess.md5_hash_provider, - longterm_key, 1, &input, &output); + code = (*kaccess.hmac)(kaccess.md5_hash_provider, longterm_key, 1, + &input, &output); if (code) goto cleanup_arcfour; if (exportable) @@ -677,8 +676,8 @@ kg_arcfour_docrypt_iov(krb5_context context, input.data = ( void *) kd_data; input.length = kd_data_len; output.data = (void *) seq_enc_key.contents; - code = (*kaccess.krb5int_hmac) (kaccess.md5_hash_provider, - &usage_key, 1, &input, &output); + code = (*kaccess.hmac)(kaccess.md5_hash_provider, &usage_key, 1, + &input, &output); if (code) goto cleanup_arcfour; |