import OpenSSL-1.0.1c

3 files changed, 47 insertions, 6 deletions

diff --git a/src/lib/libcrypto/hmac/hm_ameth.c b/src/lib/libcrypto/hmac/hm_ameth.c
index 6d8a89149e..e03f24aeda 100644
--- a/src/lib/libcrypto/hmac/hm_ameth.c
+++ b/src/lib/libcrypto/hmac/hm_ameth.c
@@ -153,7 +153,7 @@ const EVP_PKEY_ASN1_METHOD hmac_asn1_meth =
 
         hmac_size,
         0,
-        0,0,0,0,0,0,
+        0,0,0,0,0,0,0,
 
         hmac_key_free,
         hmac_pkey_ctrl,
diff --git a/src/lib/libcrypto/hmac/hm_pmeth.c b/src/lib/libcrypto/hmac/hm_pmeth.c
index 71e8567a14..0daa44511d 100644
--- a/src/lib/libcrypto/hmac/hm_pmeth.c
+++ b/src/lib/libcrypto/hmac/hm_pmeth.c
@@ -100,7 +100,8 @@ static int pkey_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
         dctx = dst->data;
         dctx->md = sctx->md;
         HMAC_CTX_init(&dctx->ctx);
-        HMAC_CTX_copy(&dctx->ctx, &sctx->ctx);
+        if (!HMAC_CTX_copy(&dctx->ctx, &sctx->ctx))
+                return 0;
         if (sctx->ktmp.data)
                 {
                 if (!ASN1_OCTET_STRING_set(&dctx->ktmp,
@@ -141,7 +142,8 @@ static int pkey_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 static int int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
         {
         HMAC_PKEY_CTX *hctx = ctx->pctx->data;
-        HMAC_Update(&hctx->ctx, data, count);
+        if (!HMAC_Update(&hctx->ctx, data, count))
+                return 0;
         return 1;
         }
 
@@ -167,7 +169,8 @@ static int hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
         if (!sig)
                 return 1;
 
-        HMAC_Final(&hctx->ctx, sig, &hlen);
+        if (!HMAC_Final(&hctx->ctx, sig, &hlen))
+                return 0;
         *siglen = (size_t)hlen;
         return 1;
         }
@@ -192,8 +195,9 @@ static int pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
                 case EVP_PKEY_CTRL_DIGESTINIT:
                 key = (ASN1_OCTET_STRING *)ctx->pkey->pkey.ptr;
-                HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md,
-                                ctx->engine);
+                if (!HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md,
+                                ctx->engine))
+                        return 0;
                 break;
 
                 default:
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
index 6c98fc43a3..ba27cbf56f 100644
--- a/src/lib/libcrypto/hmac/hmac.c
+++ b/src/lib/libcrypto/hmac/hmac.c
@@ -61,12 +61,34 @@
 #include "cryptlib.h"
 #include <openssl/hmac.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                   const EVP_MD *md, ENGINE *impl)
         {
         int i,j,reset=0;
         unsigned char pad[HMAC_MAX_MD_CBLOCK];
 
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                {
+                /* If we have an ENGINE need to allow non FIPS */
+                if ((impl || ctx->i_ctx.engine)
+                        &&  !(ctx->i_ctx.flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW))
+                        {
+                        EVPerr(EVP_F_HMAC_INIT_EX, EVP_R_DISABLED_FOR_FIPS);
+                        return 0;
+                        }
+                /* Other algorithm blocking will be done in FIPS_cmac_init,
+                 * via FIPS_hmac_init_ex().
+                 */
+                if (!impl && !ctx->i_ctx.engine)
+                        return FIPS_hmac_init_ex(ctx, key, len, md, NULL);
+                }
+#endif
+
         if (md != NULL)
                 {
                 reset=1;
@@ -133,6 +155,10 @@ int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
 
 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                return FIPS_hmac_update(ctx, data, len);
+#endif
         return EVP_DigestUpdate(&ctx->md_ctx,data,len);
         }
 
@@ -140,6 +166,10 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         {
         unsigned int i;
         unsigned char buf[EVP_MAX_MD_SIZE];
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                return FIPS_hmac_final(ctx, md, len);
+#endif
 
         if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i))
                 goto err;
@@ -179,6 +209,13 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
 
 void HMAC_CTX_cleanup(HMAC_CTX *ctx)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                {
+                FIPS_hmac_ctx_cleanup(ctx);
+                return;
+                }
+#endif
         EVP_MD_CTX_cleanup(&ctx->i_ctx);
         EVP_MD_CTX_cleanup(&ctx->o_ctx);
         EVP_MD_CTX_cleanup(&ctx->md_ctx);