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

diff --git a/src/lib/crypto/etypes.c b/src/lib/crypto/etypes.c
index b47841b12d0f37159a194f5ea6cd087c4f8eb762..36db74580964a87a1ebbb59dc876402c281001a0 100644 (file)
--- 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 },
 };