projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
985abd1
)
Typo.
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 10 Oct 2015 23:06:56 +0000
(
00:06
+0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 10 Oct 2015 23:28:20 +0000
(
00:28
+0100)
PR#4079
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit
c69ce9351336f5b4a8b33890756b3fd185528210
)
crypto/evp/e_des3.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_des3.c
b/crypto/evp/e_des3.c
index 96f272eb8046f661f5d1a14bc8fa3f545bdb19dc..bf6c1d2d3d39a44015213f7a5437e62005fdda6a 100644
(file)
--- a/
crypto/evp/e_des3.c
+++ b/
crypto/evp/e_des3.c
@@
-289,7
+289,7
@@
static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
# endif
# ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(&deskey[0], &dat->ks1)
-
! !
DES_set_key_checked(&deskey[1], &dat->ks2))
+
||
DES_set_key_checked(&deskey[1], &dat->ks2))
return 0;
# else
DES_set_key_unchecked(&deskey[0], &dat->ks1);