Reintegrate the keytype->enctype changes

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ad0195ad6da757442fed24ce4aed1d76f07fc675..55adaf2d56cf7f3d26bd742a992bfd246ca88766 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,14 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * cryptoconf.c, des_crc.c, des_md5.c raw_des.c
+               s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * cryptoconf.c : Remove krb5_csarray.
+       * cryptoconf.c, des_crc.c, des_md5.c, raw_des.c : Remove krb5_enctype 
+               references, and replace with krb5_keytype where appropriate.
+
 Thu Aug 24 17:55:47 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * des_crc.c, des_md5.c, raw_des.c: Remove casting in call to

diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index a5ac202bc931721ca90e3e9fb4f6f7970ac6caf1..53747efa90e9e061f47dafd4c3772943e4316b8d 100644 (file)
--- a/src/lib/crypto/cryptoconf.c
+++ b/src/lib/crypto/cryptoconf.c
@@ -101,28 +101,15 @@
    "krb5/encryption.h"
  */
 
-krb5_cs_table_entry * NEAR krb5_csarray[] = {
-    0,                         /* ETYPE_NULL */
-    DES_CBC_CRC_CSENTRY,       /* ETYPE_DES_CBC_CRC */
-    0,                         /* ETYPE_DES_CBC_MD4 */
-    DES_CBC_MD5_CSENTRY,       /* ETYPE_DES_CBC_MD5 */
+krb5_cs_table_entry * NEAR krb5_enctype_array[] = {
+    0,                         /* ENCTYPE_NULL */
+    DES_CBC_CRC_CSENTRY,       /* ENCTYPE_DES_CBC_CRC */
+    0,                         /* ENCTYPE_DES_CBC_MD4 */
+    DES_CBC_MD5_CSENTRY,       /* ENCTYPE_DES_CBC_MD5 */
     RAW_DES_CBC_CSENTRY,       /* ETYPE_RAW_DES_CBC */
 };
 
-int krb5_max_cryptosystem = sizeof(krb5_csarray)/sizeof(krb5_csarray[0]) - 1;
-
-krb5_cs_table_entry * NEAR krb5_keytype_array[] = {
-    0,                         /* KEYTYPE_NULL */
-#if    defined(PROVIDE_DES_CBC_MD5)
-    DES_CBC_MD5_CSENTRY                /* KEYTYPE_DES */
-#elif  defined(PROVIDE_DES_CBC_CRC)
-    DES_CBC_CRC_CSENTRY                /* KEYTYPE_DES */
-#else  /* !PROVIDE_DES_CBC_MD5 && !PROVIDE_DES_CBC_CRC */
-    0
-#endif /* !PROVIDE_DES_CBC_MD5 && !PROVIDE_DES_CBC_CRC */
-};
-
-int krb5_max_keytype = sizeof(krb5_keytype_array)/sizeof(krb5_keytype_array[0]) - 1;
+int krb5_max_enctype = sizeof(krb5_enctype_array)/sizeof(krb5_enctype_array[0]) - 1;
 
 krb5_checksum_entry * NEAR krb5_cksumarray[] = {
     0,

diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c
index f6c5d2250610457e6344efb2242be5c9fc918805..02dfb34cbc8db2528fafee875b297602b80062b8 100644 (file)
--- a/src/lib/crypto/des_crc.c
+++ b/src/lib/crypto/des_crc.c
@@ -47,8 +47,7 @@ static krb5_cryptosystem_entry mit_des_crc_cryptosystem_entry = {
     sizeof(mit_des_cblock),
     CRC32_CKSUM_LENGTH+sizeof(mit_des_cblock),
     sizeof(mit_des_cblock),
-    ETYPE_DES_CBC_CRC,
-    KEYTYPE_DES
+    ENCTYPE_DES_CBC_CRC
     };
 
 krb5_cs_table_entry krb5_des_crc_cst_entry = {

diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c
index c84d958ca762457172a4f60959912651b736f911..d365c2b6cbf6696546a192cc76733a558e9e7ed5 100644 (file)
--- a/src/lib/crypto/des_md5.c
+++ b/src/lib/crypto/des_md5.c
@@ -48,8 +48,7 @@ static krb5_cryptosystem_entry mit_des_md5_cryptosystem_entry = {
     sizeof(mit_des_cblock),
     RSA_MD5_CKSUM_LENGTH+sizeof(mit_des_cblock),
     sizeof(mit_des_cblock),
-    ETYPE_DES_CBC_MD5,
-    KEYTYPE_DES
+    ENCTYPE_DES_CBC_MD5
     };
 
 krb5_cs_table_entry krb5_des_md5_cst_entry = {

diff --git a/src/lib/crypto/raw_des.c b/src/lib/crypto/raw_des.c
index 9922dbf285814067b37784c35e8f8461bb7f7c4f..7948ba601e2de4fce63a75f832d30d9e4ad590ad 100644 (file)
--- a/src/lib/crypto/raw_des.c
+++ b/src/lib/crypto/raw_des.c
@@ -45,8 +45,7 @@ static krb5_cryptosystem_entry mit_raw_des_cryptosystem_entry = {
     sizeof(mit_des_cblock),
     0,
     sizeof(mit_des_cblock),
-    ETYPE_RAW_DES_CBC,
-    KEYTYPE_DES
+    ENCTYPE_DES_CBC_RAW
     };
 
 krb5_cs_table_entry krb5_raw_des_cst_entry = {