diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-10 08:13:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-10 08:13:00 -0400 |
| commit | 1f6433e7473a14bf4263b618d3f0c1e17196a267 (patch) | |
| tree | 9e809df23efaebf611765948726ff76805426093 /openssl/crypto/evp | |
| parent | ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3 (diff) | |
| download | vcxsrv-release/external-1.15.2.x.tar.gz vcxsrv-release/external-1.15.2.x.tar.bz2 vcxsrv-release/external-1.15.2.x.zip | |
Update openssl: 1.0.1o -> 1.0.1prelease/external-1.15.2.x
Diffstat (limited to 'openssl/crypto/evp')
| -rw-r--r-- | openssl/crypto/evp/e_aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/crypto/evp/e_aes.c b/openssl/crypto/evp/e_aes.c index 1ede7bd39..a4327fcb0 100644 --- a/openssl/crypto/evp/e_aes.c +++ b/openssl/crypto/evp/e_aes.c @@ -1146,7 +1146,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) case EVP_CTRL_CCM_SET_TAG: if ((arg & 1) || arg < 4 || arg > 16) return 0; - if ((c->encrypt && ptr) || (!c->encrypt && !ptr)) + if (c->encrypt && ptr) return 0; if (ptr) { cctx->tag_set = 1; |