aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Horowitz <marc@mit.edu>1998-09-30 03:40:21 +0000
committerMarc Horowitz <marc@mit.edu>1998-09-30 03:40:21 +0000
commitdcbf4dc310cd5e48f77f16059af04b8cf1c64f54 (patch)
treeef895e45c809b3b9ef006892d1658ed1287add83
parent3eb64614ce85a43a737a1e8dba8bd9281f98e8d5 (diff)
downloadkrb5-dcbf4dc310cd5e48f77f16059af04b8cf1c64f54.zip
krb5-dcbf4dc310cd5e48f77f16059af04b8cf1c64f54.tar.gz
krb5-dcbf4dc310cd5e48f77f16059af04b8cf1c64f54.tar.bz2
the code in the tree now reflects the current spec. update the enctypes accordingly
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10950 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/crypto/etypes.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/crypto/etypes.c b/src/lib/crypto/etypes.c
index b47841b..36db745 100644
--- a/src/lib/crypto/etypes.c
+++ b/src/lib/crypto/etypes.c
@@ -40,19 +40,14 @@ struct krb5_keytypes krb5_enctypes_list[] = {
krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
krb5_dk_string_to_key },
- { ENCTYPE_LOCAL_DES3_HMAC_SHA1,
- "des3-marc-hmac-sha1", "Triple DES with HMAC/sha1 (marc's code)",
- &krb5_enc_des3, &krb5_hash_sha1,
- krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt,
- krb5_dk_string_to_key },
{ ENCTYPE_DES3_HMAC_SHA1,
- "des3-hmac-sha1", "Triple DES with HMAC/sha1 (as yet unspecified code)",
+ "des3-hmac-sha1", "Triple DES 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,
- "des3-hmac-sha1", "Triple DES with HMAC/sha1",
- &krb5_enc_des3, &krb5_hash_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 },
};