diff options
| -rw-r--r-- | src/lib/crypto/ChangeLog | 11 | ||||
| -rw-r--r-- | src/lib/crypto/cryptoconf.c | 25 | ||||
| -rw-r--r-- | src/lib/crypto/des_crc.c | 3 | ||||
| -rw-r--r-- | src/lib/crypto/des_md5.c | 3 | ||||
| -rw-r--r-- | src/lib/crypto/raw_des.c | 3 |
5 files changed, 20 insertions, 25 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index ad0195ad6d..55adaf2d56 100644 --- 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 a5ac202bc9..53747efa90 100644 --- 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 f6c5d22506..02dfb34cbc 100644 --- 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 c84d958ca7..d365c2b6cb 100644 --- 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 9922dbf285..7948ba601e 100644 --- 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 = { |