diff options
| author | Luke Howard <lukeh@padl.com> | 2009-10-19 19:49:27 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2009-10-19 19:49:27 +0000 |
| commit | 78f2c6c0bee2e0c3c3968faf4fd99e1764de4952 (patch) | |
| tree | fa4adde68accaa3fc6f0f084aa699d006c86d127 /src/lib/crypto/krb | |
| parent | 69be36cb13a5aa74f22f37aaa0b79d0274bf5cdd (diff) | |
| download | krb5-78f2c6c0bee2e0c3c3968faf4fd99e1764de4952.zip krb5-78f2c6c0bee2e0c3c3968faf4fd99e1764de4952.tar.gz krb5-78f2c6c0bee2e0c3c3968faf4fd99e1764de4952.tar.bz2 | |
add CBC checksumtypes
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/aes-ccm@22942 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/krb')
| -rw-r--r-- | src/lib/crypto/krb/cksumtypes.c | 8 | ||||
| -rw-r--r-- | src/lib/crypto/krb/dk/dk_ccm.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/crypto/krb/cksumtypes.c b/src/lib/crypto/krb/cksumtypes.c index 2b5f33d..646cb0c 100644 --- a/src/lib/crypto/krb/cksumtypes.c +++ b/src/lib/crypto/krb/cksumtypes.c @@ -81,6 +81,14 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = { "hmac-sha1-96-aes256", { 0 }, "HMAC-SHA1 AES256 key", 0, NULL, &krb5int_hash_sha1, 12 }, + { CKSUMTYPE_AES128_CBC, 0, + "aes128-cbc", { 0 }, "CBC AES128 key", + 0, &krb5int_keyhash_aescbc_128, + NULL, 16 }, + { CKSUMTYPE_AES256_CBC, 0, + "aes256-cbc", { 0 }, "CBC AES256 key", + 0, &krb5int_keyhash_aescbc_256, + NULL, 16 }, { CKSUMTYPE_MD5_HMAC_ARCFOUR, 0, "md5-hmac-rc4", { 0 }, "Microsoft MD5 HMAC (RC4 key)", ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_md5_hmac, diff --git a/src/lib/crypto/krb/dk/dk_ccm.c b/src/lib/crypto/krb/dk/dk_ccm.c index 41f6022..37d9313 100644 --- a/src/lib/crypto/krb/dk/dk_ccm.c +++ b/src/lib/crypto/krb/dk/dk_ccm.c @@ -1,7 +1,7 @@ /* * lib/crypto/dk/dk_ccm.c * - * Copyright 2008 by the Massachusetts Institute of Technology. + * Copyright 2008, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may |