Apply one patch from Assar Westerlund <assar@sics.se>:

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

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 24841452f1fd664f9afd6721c6eed5d709c35ed7..70f1d83e07a5625c17c997974518eaa160c89172 100644 (file)
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -58,11 +58,9 @@
 
 #include "des_locl.h"
 
-OPENSSL_EXTERN int des_check_key;
-
-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;
 
@@ -87,19 +85,18 @@ void des_string_to_key(const char *str, des_cblock *key)
                        }
                }
 #endif
-       des_set_odd_parity(key);
-       i=des_check_key;
-       des_check_key=0;
-       des_set_key(key,ks);
-       des_check_key=i;
-       des_cbc_cksum((unsigned char*)str,key,length,ks,key);
-       memset(ks,0,sizeof(ks));
-       des_set_odd_parity(key);
+       DES_set_odd_parity(key);
+       if(DES_is_weak_key(key))
+           (*key)[7] ^= 0xF0;
+       DES_set_key(key,&ks);
+       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(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;
 
@@ -148,16 +145,17 @@ 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);
-       i=des_check_key;
-       des_check_key=0;
-       des_set_key(key1,ks);
-       des_cbc_cksum((unsigned char*)str,key1,length,ks,key1);
-       des_set_key(key2,ks);
-       des_cbc_cksum((unsigned char*)str,key2,length,ks,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);
+       if(DES_is_weak_key(key1))
+           (*key1)[7] ^= 0xF0;
+       DES_set_key(key1,&ks);
+       DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1);
+       if(DES_is_weak_key(key2))
+           (*key2)[7] ^= 0xF0;
+       DES_set_key(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);
        }