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/cryptoconf.c | |
| 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/cryptoconf.c')
| -rw-r--r-- | src/lib/crypto/cryptoconf.c | 21 |
1 files changed, 4 insertions, 17 deletions
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; |