* etypes.c: Update des3-cbc-sha1 to alignt with new number

	assignments.

	* cksumtypes.c: Update hmac-sha1-des3 to align with new number
	assignments.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11684 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 7d4cf47d64055cf3fd6c4ec9cc8a94644de28ffc..842e5ce9cf8b20aa048c7fb590e4579fdefea95b 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,11 @@
+1999-08-18  Tom Yu  <tlyu@mit.edu>
+
+       * etypes.c: Update des3-cbc-sha1 to alignt with new number
+       assignments.
+
+       * cksumtypes.c: Update hmac-sha1-des3 to align with new number
+       assignments.
+
 Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Remove - from recursive Win32 make invocation.

diff --git a/src/lib/crypto/cksumtypes.c b/src/lib/crypto/cksumtypes.c
index 8107d3b8f7fb2310ac931d05098330686a2a21aa..205b064bf42fb55c4e29dc7e368ff7763e3af8e5 100644 (file)
--- a/src/lib/crypto/cksumtypes.c
+++ b/src/lib/crypto/cksumtypes.c
@@ -63,8 +63,8 @@ struct krb5_cksumtypes krb5_cksumtypes_list[] = {
       0, NULL,
       &krb5_hash_sha1 },
 
-    { CKSUMTYPE_HMAC_SHA1, KRB5_CKSUMFLAG_DERIVE,
-      "hmac-sha1", "HMAC-SHA1",
+    { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
+      "hmac-sha1-des3", "HMAC-SHA1 DES3 key",
       0, NULL,
       &krb5_hash_sha1 },
 };

diff --git a/src/lib/crypto/etypes.c b/src/lib/crypto/etypes.c
index 4d16aa96a7b5291f5968b30f5e5730262808c197..9a60a45681c6c3d42d8ae9b362de3c1e26d1a2c2 100644 (file)
--- a/src/lib/crypto/etypes.c
+++ b/src/lib/crypto/etypes.c
@@ -66,8 +66,8 @@ struct krb5_keytypes krb5_enctypes_list[] = {
       krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
       krb5_dk_string_to_key },
 
-    { ENCTYPE_DES3_HMAC_SHA1,
-      "des3-hmac-sha1", "Triple DES with HMAC/sha1",
+    { ENCTYPE_DES3_CBC_SHA1,
+      "des3-cbc-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 },