Source code cleanups: Use void * rather than char * in lhash,

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

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 3365c1bcf3019765dc5a1e85904ed168463389bd..c6abb872012f4cf2087d46fb5f40e6c7fe92714d 100644 (file)
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -58,11 +58,7 @@
 
 #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;
        int i,length;
@@ -89,21 +85,14 @@ 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);
+       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((des_cblock *)key);
+       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;
        int i,length;
@@ -154,17 +143,12 @@ 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;
+       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);