diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-10-11 00:06:56 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-10-11 00:38:04 +0100 |
| commit | d7ebdc2e98f7cc1df99fd7dd675bb6cfd6adb1ba (patch) | |
| tree | 6925cf664d244a036150a13759e6d6c4af0c8369 | |
| parent | 54edf96459dbece958707c6a8e92e82ada1d1c59 (diff) | |
Typo.
PR#4079
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210)
Conflicts:
crypto/evp/e_des3.c
| -rw-r--r-- | crypto/evp/e_des3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 464168be3a..74857347be 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -239,7 +239,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, DES_cblock *deskey = (DES_cblock *)key; # ifdef EVP_CHECK_DES_KEY 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; # else DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); |