Because of recent reductions in header interdependencies, these files need

[openssl.git] / crypto / des / str2key.c

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index c6abb872012f4cf2087d46fb5f40e6c7fe92714d..9c2054bda6b9da92351d3d1a37dac671dcf0c25b 100644 (file)
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -57,10 +57,11 @@
  */
 
 #include "des_locl.h"
+#include <openssl/crypto.h>
 
-void des_string_to_key(const char *str, des_cblock *key)
+void DES_string_to_key(const char *str, DES_cblock *key)
        {
-       des_key_schedule ks;
+       DES_key_schedule ks;
        int i,length;
        register unsigned char j;
 
@@ -85,16 +86,22 @@ void des_string_to_key(const char *str, des_cblock *key)
                        }
                }
 #endif
-       des_set_odd_parity(key);
-       des_set_key_unchecked(key,ks);
-       des_cbc_cksum((const unsigned char*)str,key,length,ks,key);
-       memset(ks,0,sizeof(ks));
-       des_set_odd_parity(key);
+       DES_set_odd_parity(key);
+#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
+       if(DES_is_weak_key(key))
+           (*key)[7] ^= 0xF0;
+       DES_set_key(key,&ks);
+#else
+       DES_set_key_unchecked(key,&ks);
+#endif
+       DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key);
+       OPENSSL_cleanse(&ks,sizeof(ks));
+       DES_set_odd_parity(key);
        }
 
-void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2)
+void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
        {
-       des_key_schedule ks;
+       DES_key_schedule ks;
        int i,length;
        register unsigned char j;
 
@@ -143,13 +150,25 @@ void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2)
                }
        if (length <= 8) memcpy(key2,key1,8);
 #endif
-       des_set_odd_parity(key1);
-       des_set_odd_parity(key2);
-       des_set_key_unchecked(key1,ks);
-       des_cbc_cksum((const unsigned char*)str,key1,length,ks,key1);
-       des_set_key_unchecked(key2,ks);
-       des_cbc_cksum((const unsigned char*)str,key2,length,ks,key2);
-       memset(ks,0,sizeof(ks));
-       des_set_odd_parity(key1);
-       des_set_odd_parity(key2);
+       DES_set_odd_parity(key1);
+       DES_set_odd_parity(key2);
+#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
+       if(DES_is_weak_key(key1))
+           (*key1)[7] ^= 0xF0;
+       DES_set_key(key1,&ks);
+#else
+       DES_set_key_unchecked(key1,&ks);
+#endif
+       DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1);
+#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
+       if(DES_is_weak_key(key2))
+           (*key2)[7] ^= 0xF0;
+       DES_set_key(key2,&ks);
+#else
+       DES_set_key_unchecked(key2,&ks);
+#endif
+       DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);
+       OPENSSL_cleanse(&ks,sizeof(ks));
+       DES_set_odd_parity(key1);
+       DES_set_odd_parity(key2);
        }