Link GCM into FIPS module. Check return value in EVP gcm.

[openssl.git] / crypto / evp / e_aes.c

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 34a350a8804873998b74b1bfeb745ee742cf528d..ed21d0a923ce97edb629682b6ff422bb7dc9387e 100644 (file)
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -312,11 +312,20 @@ static int aes_gcm(EVP_CIPHER_CTX *ctx, unsigned char *out,
        if (in)
                {
                if (out == NULL)
-                       CRYPTO_gcm128_aad(gctx->gcm, in, len);
+                       {
+                       if (CRYPTO_gcm128_aad(gctx->gcm, in, len))
+                               return -1;
+                       }
                else if (ctx->encrypt)
-                       CRYPTO_gcm128_encrypt(gctx->gcm, in, out, len);
+                       {
+                       if (CRYPTO_gcm128_encrypt(gctx->gcm, in, out, len))
+                               return -1;
+                       }
                else
-                       CRYPTO_gcm128_decrypt(gctx->gcm, in, out, len);
+                       {
+                       if (CRYPTO_gcm128_decrypt(gctx->gcm, in, out, len))
+                               return -1;
+                       }
                return len;
                }
        else