From 10230e950a2ee7df314fd6e2e9ca93870dfb8b41 Mon Sep 17 00:00:00 2001 From: Paul Park Date: Thu, 27 Jul 1995 19:45:12 +0000 Subject: [PATCH] Set the KEYTYPE_DES keytable entry to the MD5 one if enabled git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6340 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 9 +++++++++ src/lib/crypto/cryptoconf.c | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 0a11ddf31..ac59882f1 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jul 27 15:15:46 EDT 1995 Paul Park (pjpark@mit.edu) + * configure.in - Add --enable-{des-cbc-md5,des-cbc-crc,raw-des-cbc, + des-cbc-cksum,crc32,rsa-md4,rsa-md5} which set the appropriate + preprocessor flags which used to be set in k5-config.h. + * cryptoconf.c - Set the KEYTYPE_DES entry to the DES-CBC-MD5 entry + if enabled, then the DES-CBC-CRC entry, if enabled, then to + null. + Fri Jun 23 12:16:52 1995 Sam Hartman * configure.in: krb5_cv_staticlibs_enabled, not diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c index e8aec2c61..a5ac202bc 100644 --- a/src/lib/crypto/cryptoconf.c +++ b/src/lib/crypto/cryptoconf.c @@ -113,7 +113,13 @@ 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; -- 2.26.2