projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 36c3f81d9939051f38d0e4ff3d01a61d6dba62a4..9c2054bda6b9da92351d3d1a37dac671dcf0c25b 100644
(file)
--- a/
crypto/des/str2key.c
+++ b/
crypto/des/str2key.c
@@
-57,6
+57,7
@@
*/
#include "des_locl.h"
*/
#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)
{
@@
-94,7
+95,7
@@
void DES_string_to_key(const char *str, DES_cblock *key)
DES_set_key_unchecked(key,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key);
DES_set_key_unchecked(key,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key);
-
memset(&ks,0
,sizeof(ks));
+
OPENSSL_cleanse(&ks
,sizeof(ks));
DES_set_odd_parity(key);
}
DES_set_odd_parity(key);
}
@@
-167,7
+168,7
@@
void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
DES_set_key_unchecked(key2,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);
DES_set_key_unchecked(key2,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);
-
memset(&ks,0
,sizeof(ks));
+
OPENSSL_cleanse(&ks
,sizeof(ks));
DES_set_odd_parity(key1);
DES_set_odd_parity(key2);
}
DES_set_odd_parity(key1);
DES_set_odd_parity(key2);
}