X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fstr2key.c;h=9c2054bda6b9da92351d3d1a37dac671dcf0c25b;hb=f4d0392faa58eafbf984fa6fb2afbb0667aad37e;hp=36c3f81d9939051f38d0e4ff3d01a61d6dba62a4;hpb=003144a8e8ed5c6c4aaee6e227773bb3d6bc0f9d;p=oweals%2Fopenssl.git diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index 36c3f81d99..9c2054bda6 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -57,6 +57,7 @@ */ #include "des_locl.h" +#include 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); - memset(&ks,0,sizeof(ks)); + OPENSSL_cleanse(&ks,sizeof(ks)); 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); - memset(&ks,0,sizeof(ks)); + OPENSSL_cleanse(&ks,sizeof(ks)); DES_set_odd_parity(key1); DES_set_odd_parity(key2); }