generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Typo.

Browse Source 
PR#4079

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210)

Conflicts:
	crypto/evp/e_des3.c
This commit is contained in:
Dr. Stephen Henson 2015-10-11 00:06:56 +01:00
parent bfc19297cd
commit b2593839da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/e_des3.c
View File

@ -241,7 +241,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
DES_cblock *deskey = (DES_cblock *)key; DES_cblock *deskey = (DES_cblock *)key;
# ifdef EVP_CHECK_DES_KEY # ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
! !DES_set_key_checked(&deskey[1], &data(ctx)->ks2)) || DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
return 0; return 0;
# else # else
DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);