* 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
aadamowski · Aug 18, 1999 · 93e2a19 · 93e2a19
1 parent 3516959
commit 93e2a19
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 },