diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-08-03 09:11:45 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-08-03 09:11:45 +0000 |
commit | a3c38411e7f9428195d37a332e5d50aa651b9747 (patch) | |
tree | 2d485fe6236006d7055febef8361a8ed3bfe14b2 /src | |
parent | 90a28345c47111b83ac8048f07d6f808445281bb (diff) | |
download | krb5-a3c38411e7f9428195d37a332e5d50aa651b9747.zip krb5-a3c38411e7f9428195d37a332e5d50aa651b9747.tar.gz krb5-a3c38411e7f9428195d37a332e5d50aa651b9747.tar.bz2 |
Simplify krb5int_dk_cmac_checksum since ctp->enc is set for the
relevant checksum types (and thus key verification occurs in the
caller).
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/camellia-ccm@24226 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/crypto/krb/dk/checksum_cmac.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/crypto/krb/dk/checksum_cmac.c b/src/lib/crypto/krb/dk/checksum_cmac.c index ad036a1..9a87f1d 100644 --- a/src/lib/crypto/krb/dk/checksum_cmac.c +++ b/src/lib/crypto/krb/dk/checksum_cmac.c @@ -38,23 +38,12 @@ krb5int_dk_cmac_checksum(const struct krb5_cksumtypes *ctp, const krb5_crypto_iov *data, size_t num_data, krb5_data *output) { - const struct krb5_keytypes *ktp; - const struct krb5_enc_provider *enc; + const struct krb5_enc_provider *enc = ctp->enc; krb5_error_code ret; unsigned char constantdata[K5CLENGTH]; krb5_data datain; krb5_key kc; - /* Use the key's enctype (more flexible than setting an enctype in ctp). */ - ktp = find_enctype(key->keyblock.enctype); - if (ktp == NULL) - return KRB5_BAD_ENCTYPE; - enc = ktp->enc; - if (key->keyblock.length != enc->keylength) - return KRB5_BAD_KEYSIZE; - if (ctp->compute_size != enc->block_size) - return KRB5_BAD_MSIZE; - /* Derive the key. */ datain = make_data(constantdata, K5CLENGTH); store_32_be(usage, constantdata); |