* cryptoconf.c, des_crc.c, des_md5.c raw_des.c

		s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 0c117b8e92d71fe8651be78c2a64f3fa67e58ab9..55adaf2d56cf7f3d26bd742a992bfd246ca88766 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+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)
 

diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index 0efb6d55ef4573476221e5868c8b9772bb5f3c96..53747efa90e9e061f47dafd4c3772943e4316b8d 100644 (file)
--- a/src/lib/crypto/cryptoconf.c
+++ b/src/lib/crypto/cryptoconf.c
@@ -101,15 +101,15 @@
    "krb5/encryption.h"
  */
 
-krb5_cs_table_entry * NEAR krb5_keytype_array[] = {
-    0,                         /* KEYTYPE_NULL */
-    DES_CBC_CRC_CSENTRY,       /* KEYTYPE_DES_CBC_CRC */
-    0,                         /* KEYTYPE_DES_CBC_MD4 */
-    DES_CBC_MD5_CSENTRY,       /* KEYTYPE_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_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 7ae2559623e89b8c359a7f845ed166a4b9478b59..02dfb34cbc8db2528fafee875b297602b80062b8 100644 (file)
--- a/src/lib/crypto/des_crc.c
+++ b/src/lib/crypto/des_crc.c
@@ -47,7 +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),
-    KEYTYPE_DES_CBC_CRC
+    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 b4165ca4b6373383a44541a4bcabd6ca3468cffa..d365c2b6cbf6696546a192cc76733a558e9e7ed5 100644 (file)
--- a/src/lib/crypto/des_md5.c
+++ b/src/lib/crypto/des_md5.c
@@ -48,7 +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),
-    KEYTYPE_DES_CBC_MD5
+    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 3afe4f2c8e0889c7fc739f8f4c6432263853e066..7948ba601e2de4fce63a75f832d30d9e4ad590ad 100644 (file)
--- a/src/lib/crypto/raw_des.c
+++ b/src/lib/crypto/raw_des.c
@@ -45,7 +45,7 @@ static krb5_cryptosystem_entry mit_raw_des_cryptosystem_entry = {
     sizeof(mit_des_cblock),
     0,
     sizeof(mit_des_cblock),
-    KEYTYPE_DES_CBC_RAW
+    ENCTYPE_DES_CBC_RAW
     };
 
 krb5_cs_table_entry krb5_raw_des_cst_entry = {