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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 0a11ddf3110f662a7990513bd28bf312fe02c9c9..ac59882f1b7a66a73a0cf4ad47528bb51d480600 100644 (file)
--- 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  <hartmans@tardis.MIT.EDU>
 
        * configure.in: krb5_cv_staticlibs_enabled, not

diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index e8aec2c610e5879f67ccf3fe0f63d7ee417d9ae8..a5ac202bc931721ca90e3e9fb4f6f7970ac6caf1 100644 (file)
--- 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;