diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:28:39 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:28:39 +0000 |
| commit | 8e22bb9fc0d80cf1597e88fffe50e95112ead701 (patch) | |
| tree | 06f86f7d42d9f8671feda137658e76a6618611c8 /src/lib/crypto | |
| parent | 47abf305db8fccf739d3ec3428fd23a237a82776 (diff) | |
| download | krb5-8e22bb9fc0d80cf1597e88fffe50e95112ead701.tar.gz krb5-8e22bb9fc0d80cf1597e88fffe50e95112ead701.tar.xz krb5-8e22bb9fc0d80cf1597e88fffe50e95112ead701.zip | |
* 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.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6675 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/cryptoconf.c | 21 | ||||
| -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, 14 insertions, 23 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index ad0195ad6..0c117b8e9 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ + +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 a5ac202bc..0efb6d55e 100644 --- a/src/lib/crypto/cryptoconf.c +++ b/src/lib/crypto/cryptoconf.c @@ -101,25 +101,12 @@ "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 */ - 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 */ + DES_CBC_CRC_CSENTRY, /* KEYTYPE_DES_CBC_CRC */ + 0, /* KEYTYPE_DES_CBC_MD4 */ + DES_CBC_MD5_CSENTRY, /* KEYTYPE_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; diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c index f6c5d2250..7ae255962 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 + KEYTYPE_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 c84d958ca..b4165ca4b 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 + KEYTYPE_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 9922dbf28..3afe4f2c8 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 + KEYTYPE_DES_CBC_RAW }; krb5_cs_table_entry krb5_raw_des_cst_entry = { |