diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-10-28 19:17:35 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-10-28 19:17:35 +0000 |
| commit | 83c40776396c2c79a1f3a582cb1be6872b871be5 (patch) | |
| tree | 159a0e38a51d8c8610a7bdfcdceaaadd46d4d2fc /src/lib/gssapi/krb5/util_crypt.c | |
| parent | 7da28b8d6f545c8c8c9880d854325d479bba1861 (diff) | |
| download | krb5-83c40776396c2c79a1f3a582cb1be6872b871be5.tar.gz krb5-83c40776396c2c79a1f3a582cb1be6872b871be5.tar.xz krb5-83c40776396c2c79a1f3a582cb1be6872b871be5.zip | |
Bump the accessor version number since we made changes.
Take the opportunity to regularize accessor field names (no krb5 or
krb5int prefixes).
Fix a test program which was still using krb5_hmac.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23081 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/krb5/util_crypt.c')
| -rw-r--r-- | src/lib/gssapi/krb5/util_crypt.c | 21 |
1 files changed, 10 insertions, 11 deletions
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; |