diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-10-16 22:46:08 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-12-16 14:08:30 +0000 |
| commit | 7e98d95f56aac520a5fcb0aaf708bac13cbb7523 (patch) | |
| tree | eeafe845bd987a729ade68ccdd54e640bb869a29 | |
| parent | b0ee17ad475c97f068c7314efafdd8a53d92af54 (diff) | |
Don't require tag before ciphertext in AESGCM mode
(cherry picked from commit 964eaad78ccdc6c4537664924e6082b08cc1c8ee)
| -rw-r--r-- | crypto/evp/e_aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 71f9e037d5..45e85047f1 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -956,8 +956,6 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, if (!gctx->iv_set) return -1; - if (!ctx->encrypt && gctx->taglen < 0) - return -1; if (in) { if (out == NULL) @@ -999,6 +997,8 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, { if (!ctx->encrypt) { + if (gctx->taglen < 0) + return -1; if (CRYPTO_gcm128_finish(&gctx->gcm, ctx->buf, gctx->taglen) != 0) return -1; |