diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 00:24:13 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 00:24:13 +0000 |
| commit | fe7a4be921dc4cb90177f03f5dab05db57ea0084 (patch) | |
| tree | 38085167a74a6e1c877fa280ac692682fb2d4893 /src/lib/crypto/cryptoconf.c | |
| parent | e5dea71db5ff72199c3cd2139809bd8117591fe7 (diff) | |
| download | krb5-fe7a4be921dc4cb90177f03f5dab05db57ea0084.tar.gz krb5-fe7a4be921dc4cb90177f03f5dab05db57ea0084.tar.xz krb5-fe7a4be921dc4cb90177f03f5dab05db57ea0084.zip | |
Reintegrate the keytype->enctype changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6759 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/cryptoconf.c')
| -rw-r--r-- | src/lib/crypto/cryptoconf.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c index a5ac202bc..53747efa9 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, |