Change OPENSSL_FIPSEVP to OPENSSL_FIPSAPI as it doesn't just refer

[openssl.git] / crypto / hmac / hmac.c

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 50765e227bf2ef0a3a0c134537dc390c7bff4d23..dc28d8da872972a755118b5f861b6020faef2f29 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -55,13 +55,16 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+
+#define OPENSSL_FIPSAPI
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <openssl/hmac.h>
 #include "cryptlib.h"
+#include <openssl/hmac.h>
 
-void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
+int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                  const EVP_MD *md, ENGINE *impl)
        {
        int i,j,reset=0;
@@ -78,18 +81,21 @@ void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
        if (key != NULL)
                {
                reset=1;
-               j=EVP_MD_block_size(md);
+               j=M_EVP_MD_block_size(md);
                OPENSSL_assert(j <= (int)sizeof(ctx->key));
                if (j < len)
                        {
-                       EVP_DigestInit_ex(&ctx->md_ctx,md, impl);
-                       EVP_DigestUpdate(&ctx->md_ctx,key,len);
-                       EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key,
-                               &ctx->key_length);
+                       if (!EVP_DigestInit_ex(&ctx->md_ctx,md, impl))
+                               goto err;
+                       if (!EVP_DigestUpdate(&ctx->md_ctx,key,len))
+                               goto err;
+                       if (!EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key,
+                               &ctx->key_length))
+                               goto err;
                        }
                else
                        {
-                       OPENSSL_assert(len <= (int)sizeof(ctx->key));
+                       OPENSSL_assert(len>=0 && len<=(int)sizeof(ctx->key));
                        memcpy(ctx->key,key,len);
                        ctx->key_length=len;
                        }
@@ -102,42 +108,53 @@ void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                {
                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
                        pad[i]=0x36^ctx->key[i];
-               EVP_DigestInit_ex(&ctx->i_ctx,md, impl);
-               EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md));
+               if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl))
+                       goto err;
+               if (!EVP_DigestUpdate(&ctx->i_ctx,pad,M_EVP_MD_block_size(md)))
+                       goto err;
 
                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
                        pad[i]=0x5c^ctx->key[i];
-               EVP_DigestInit_ex(&ctx->o_ctx,md, impl);
-               EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md));
+               if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl))
+                       goto err;
+               if (!EVP_DigestUpdate(&ctx->o_ctx,pad,M_EVP_MD_block_size(md)))
+                       goto err;
                }
-       EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx);
+       if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx))
+                       goto err;
+       return 1;
+       err:
+       return 0;
        }
 
-void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-              const EVP_MD *md)
+int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
        {
        if(key && md)
            HMAC_CTX_init(ctx);
-       HMAC_Init_ex(ctx,key,len,md, NULL);
+       return HMAC_Init_ex(ctx,key,len,md, NULL);
        }
 
-void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
+int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
        {
-       EVP_DigestUpdate(&ctx->md_ctx,data,len);
+       return EVP_DigestUpdate(&ctx->md_ctx,data,len);
        }
 
-void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
+int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
        {
-       int j;
        unsigned int i;
        unsigned char buf[EVP_MAX_MD_SIZE];
 
-       j=EVP_MD_block_size(ctx->md);
-
-       EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i);
-       EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx);
-       EVP_DigestUpdate(&ctx->md_ctx,buf,i);
-       EVP_DigestFinal_ex(&ctx->md_ctx,md,len);
+       if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i))
+               goto err;
+       if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx))
+               goto err;
+       if (!EVP_DigestUpdate(&ctx->md_ctx,buf,i))
+               goto err;
+       if (!EVP_DigestFinal_ex(&ctx->md_ctx,md,len))
+               goto err;
+       return 1;
+       err:
+       return 0;
        }
 
 void HMAC_CTX_init(HMAC_CTX *ctx)
@@ -147,6 +164,23 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
        EVP_MD_CTX_init(&ctx->md_ctx);
        }
 
+int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
+       {
+       HMAC_CTX_init(dctx);
+       if (!EVP_MD_CTX_copy_ex(&dctx->i_ctx, &sctx->i_ctx))
+               goto err;
+       if (!EVP_MD_CTX_copy_ex(&dctx->o_ctx, &sctx->o_ctx))
+               goto err;
+       if (!EVP_MD_CTX_copy_ex(&dctx->md_ctx, &sctx->md_ctx))
+               goto err;
+       memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
+       dctx->key_length = sctx->key_length;
+       dctx->md = sctx->md;
+       return 1;
+       err:
+       return 0;
+       }
+
 void HMAC_CTX_cleanup(HMAC_CTX *ctx)
        {
        EVP_MD_CTX_cleanup(&ctx->i_ctx);
@@ -164,10 +198,21 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
 
        if (md == NULL) md=m;
        HMAC_CTX_init(&c);
-       HMAC_Init(&c,key,key_len,evp_md);
-       HMAC_Update(&c,d,n);
-       HMAC_Final(&c,md,md_len);
+       if (!HMAC_Init(&c,key,key_len,evp_md))
+               goto err;
+       if (!HMAC_Update(&c,d,n))
+               goto err;
+       if (!HMAC_Final(&c,md,md_len))
+               goto err;
        HMAC_CTX_cleanup(&c);
-       return(md);
+       return md;
+       err:
+       return NULL;
        }
 
+void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
+       {
+       M_EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
+       M_EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
+       M_EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
+       }