diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-10 08:56:32 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-26 11:34:07 -0400 |
| commit | 9ece505c5ca92218e41adedfa6d8c47574bd9271 (patch) | |
| tree | fbb27f113769b94dafa26ab43a5843c7e7454fb6 /openssl/crypto/evp | |
| parent | 6d650329125473a3b773f03f2fb704a094d92b55 (diff) | |
| download | vcxsrv-9ece505c5ca92218e41adedfa6d8c47574bd9271.tar.gz vcxsrv-9ece505c5ca92218e41adedfa6d8c47574bd9271.tar.bz2 vcxsrv-9ece505c5ca92218e41adedfa6d8c47574bd9271.zip | |
Update openssl: 1.0.2c -> 1.0.2d
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 33cbed87f..1734a823c 100644 --- a/openssl/crypto/evp/e_aes.c +++ b/openssl/crypto/evp/e_aes.c @@ -1771,7 +1771,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; |