diff options
| author | Ken Raeburn <raeburn@mit.edu> | 1999-09-01 20:44:39 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 1999-09-01 20:44:39 +0000 |
| commit | 8347de78dd4db98ac4a94aee56d177eae2dd68bd (patch) | |
| tree | 612b01b2dd4325733916353a3c1369e3f6e425dc /src | |
| parent | 3b98abd62460cb7ec71fddfdfa10825d2f0cf1bd (diff) | |
| download | krb5-8347de78dd4db98ac4a94aee56d177eae2dd68bd.tar.gz krb5-8347de78dd4db98ac4a94aee56d177eae2dd68bd.tar.xz krb5-8347de78dd4db98ac4a94aee56d177eae2dd68bd.zip | |
Tom's cryptosystem alias entries from 1.1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11763 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/cksumtypes.c | 4 | ||||
| -rw-r--r-- | src/lib/crypto/etypes.c | 20 |
3 files changed, 31 insertions, 0 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 842e5ce9cf..2959956e8a 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ +1999-08-26 Tom Yu <tlyu@mit.edu> + + * etypes.c: Add aliases "des" for "des-cbc-md5", "des3-hmac-sha1" + and "des3-cbc-sha1-kd" for "des3-cbc-sha1". + + * cksumtypes.c: Add alias "hmac-sha1-des3-kd". + 1999-08-18 Tom Yu <tlyu@mit.edu> * etypes.c: Update des3-cbc-sha1 to alignt with new number diff --git a/src/lib/crypto/cksumtypes.c b/src/lib/crypto/cksumtypes.c index 205b064bf4..8f3d211754 100644 --- a/src/lib/crypto/cksumtypes.c +++ b/src/lib/crypto/cksumtypes.c @@ -67,6 +67,10 @@ struct krb5_cksumtypes krb5_cksumtypes_list[] = { "hmac-sha1-des3", "HMAC-SHA1 DES3 key", 0, NULL, &krb5_hash_sha1 }, + { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE, + "hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */ + 0, NULL, + &krb5_hash_sha1 }, }; int krb5_cksumtypes_length = diff --git a/src/lib/crypto/etypes.c b/src/lib/crypto/etypes.c index 9a60a45681..fe4b710332 100644 --- a/src/lib/crypto/etypes.c +++ b/src/lib/crypto/etypes.c @@ -54,6 +54,11 @@ struct krb5_keytypes krb5_enctypes_list[] = { &krb5_enc_des, &krb5_hash_md5, krb5_old_encrypt_length, krb5_old_encrypt, krb5_old_decrypt, krb5_des_string_to_key }, + { ENCTYPE_DES_CBC_MD5, + "des", "DES cbc mode with RSA-MD5", /* alias */ + &krb5_enc_des, &krb5_hash_md5, + krb5_old_encrypt_length, krb5_old_encrypt, krb5_old_decrypt, + krb5_des_string_to_key }, { ENCTYPE_DES_CBC_RAW, "des-cbc-raw", "DES cbc mode raw", @@ -71,12 +76,27 @@ struct krb5_keytypes krb5_enctypes_list[] = { &krb5_enc_des3, &krb5_hash_sha1, krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, krb5_dk_string_to_key }, + { ENCTYPE_DES3_CBC_SHA1, /* alias */ + "des3-hmac-sha1", "Triple DES cbc mode with HMAC/sha1", + &krb5_enc_des3, &krb5_hash_sha1, + krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, + krb5_dk_string_to_key }, + { ENCTYPE_DES3_CBC_SHA1, /* alias */ + "des3-cbc-sha1-kd", "Triple DES cbc mode with HMAC/sha1", + &krb5_enc_des3, &krb5_hash_sha1, + krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, + krb5_dk_string_to_key }, + { ENCTYPE_DES_HMAC_SHA1, "des-hmac-sha1", "DES with HMAC/sha1", &krb5_enc_des, &krb5_hash_sha1, krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, krb5_dk_string_to_key }, #ifdef ATHENA_DES3_KLUDGE + /* + * If you are using this, you're almost certainly doing the + * Wrong Thing. + */ { ENCTYPE_LOCAL_DES3_HMAC_SHA1, "des3-marc-hmac-sha1", "Triple DES with HMAC/sha1 and 32-bit length code", |