import openssl-0.9.7-beta1

1 files changed, 36 insertions, 34 deletions

diff --git a/src/lib/libcrypto/des/str2key.c b/src/lib/libcrypto/des/str2key.c
index 3365c1bcf3..36c3f81d99 100644
--- a/src/lib/libcrypto/des/str2key.c
+++ b/src/lib/libcrypto/des/str2key.c
@@ -58,13 +58,9 @@
 
 #include "des_locl.h"
 
-extern int des_check_key;
-
-void des_string_to_key(str, key)
-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;
 
@@ -89,23 +85,22 @@ des_cblock (*key);
                         }
                 }
 #endif
-        des_set_odd_parity((des_cblock *)key);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key((des_cblock *)key,ks);
-        des_check_key=i;
-        des_cbc_cksum((des_cblock *)str,(des_cblock *)key,(long)length,ks,
-                (des_cblock *)key);
-        memset(ks,0,sizeof(ks));
-        des_set_odd_parity((des_cblock *)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);
+        memset(&ks,0,sizeof(ks));
+        DES_set_odd_parity(key);
         }
 
-void des_string_to_2keys(str, key1, key2)
-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;
 
@@ -154,18 +149,25 @@ des_cblock (*key2);
                 }
         if (length <= 8) memcpy(key2,key1,8);
 #endif
-        des_set_odd_parity((des_cblock *)key1);
-        des_set_odd_parity((des_cblock *)key2);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key((des_cblock *)key1,ks);
-        des_cbc_cksum((des_cblock *)str,(des_cblock *)key1,(long)length,ks,
-                (des_cblock *)key1);
-        des_set_key((des_cblock *)key2,ks);
-        des_cbc_cksum((des_cblock *)str,(des_cblock *)key2,(long)length,ks,
-                (des_cblock *)key2);
-        des_check_key=i;
-        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);
+        memset(&ks,0,sizeof(ks));
+        DES_set_odd_parity(key1);
+        DES_set_odd_parity(key2);
         }