Use utility functions for HMAC and CMAC.

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

diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c
index 985921ca1ae20c7dda07cb52bc368916d954dd01..268b48dbce6f223297d9432bfeec8590b9b058b7 100644 (file)
--- a/crypto/hmac/hm_pmeth.c
+++ b/crypto/hmac/hm_pmeth.c
@@ -1,5 +1,6 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2007.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2007.

  */
 /* ====================================================================
  * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
  */
 /* ====================================================================
  * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.


@@ -9,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.

  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in


@@ -56,210 +57,191 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include "cryptlib.h"
+#include "internal/cryptlib.h"

 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>

-#include "evp_locl.h"
+#include "internal/evp_int.h"

 
 /* HMAC pkey context structure */
 
 
 /* HMAC pkey context structure */
 

-typedef struct
-       {
-       const EVP_MD *md;       /* MD for HMAC use */
-       ASN1_OCTET_STRING ktmp; /* Temp storage for key */
-       HMAC_CTX ctx;
-       } HMAC_PKEY_CTX;
+typedef struct {
+    const EVP_MD *md;           /* MD for HMAC use */
+    ASN1_OCTET_STRING ktmp;     /* Temp storage for key */
+    HMAC_CTX *ctx;
+} HMAC_PKEY_CTX;

 
 static int pkey_hmac_init(EVP_PKEY_CTX *ctx)
 
 static int pkey_hmac_init(EVP_PKEY_CTX *ctx)

-       {
-       HMAC_PKEY_CTX *hctx;
-       hctx = OPENSSL_malloc(sizeof(HMAC_PKEY_CTX));
-       if (!hctx)
-               return 0;
-       hctx->md = NULL;
-       hctx->ktmp.data = NULL;
-       hctx->ktmp.length = 0;
-       hctx->ktmp.flags = 0;
-       hctx->ktmp.type = V_ASN1_OCTET_STRING;
-       HMAC_CTX_init(&hctx->ctx);
-
-       ctx->data = hctx;
-       ctx->keygen_info_count = 0;
-
-       return 1;
-       }
+{
+    HMAC_PKEY_CTX *hctx;
+
+    hctx = OPENSSL_zalloc(sizeof(*hctx));
+    if (hctx == NULL)
+        return 0;
+    hctx->ktmp.type = V_ASN1_OCTET_STRING;
+    hctx->ctx = HMAC_CTX_new();
+
+    ctx->data = hctx;
+    ctx->keygen_info_count = 0;
+
+    return 1;
+}

 
 static int pkey_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
 
 static int pkey_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)

-       {
-       HMAC_PKEY_CTX *sctx, *dctx;
-       if (!pkey_hmac_init(dst))
-               return 0;
-               sctx = src->data;
-       dctx = dst->data;
-       dctx->md = sctx->md;
-       HMAC_CTX_init(&dctx->ctx);
-       HMAC_CTX_copy(&dctx->ctx, &sctx->ctx);
-       if (sctx->ktmp.data)
-               {
-               if (!ASN1_OCTET_STRING_set(&dctx->ktmp,
-                                       sctx->ktmp.data, sctx->ktmp.length))
-                       return 0;
-               }
-       return 1;
-       }
+{
+    HMAC_PKEY_CTX *sctx, *dctx;
+    if (!pkey_hmac_init(dst))
+        return 0;
+    sctx = src->data;
+    dctx = dst->data;
+    dctx->md = sctx->md;
+    if (!HMAC_CTX_copy(dctx->ctx, sctx->ctx))
+        return 0;
+    if (sctx->ktmp.data) {
+        if (!ASN1_OCTET_STRING_set(&dctx->ktmp,
+                                   sctx->ktmp.data, sctx->ktmp.length))
+            return 0;
+    }
+    return 1;
+}

 
 static void pkey_hmac_cleanup(EVP_PKEY_CTX *ctx)
 
 static void pkey_hmac_cleanup(EVP_PKEY_CTX *ctx)

-       {
-       HMAC_PKEY_CTX *hctx = ctx->data;
-       HMAC_CTX_cleanup(&hctx->ctx);
-       if (hctx->ktmp.data)
-               {
-               if (hctx->ktmp.length)
-                       OPENSSL_cleanse(hctx->ktmp.data, hctx->ktmp.length);
-               OPENSSL_free(hctx->ktmp.data);
-               hctx->ktmp.data = NULL;
-               }
-       OPENSSL_free(hctx);
-       }
+{
+    HMAC_PKEY_CTX *hctx = ctx->data;
+
+    if (hctx != NULL) {
+        HMAC_CTX_free(hctx->ctx);
+        OPENSSL_clear_free(hctx->ktmp.data, hctx->ktmp.length);
+        OPENSSL_free(hctx);
+        ctx->data = NULL;
+    }
+}

 
 static int pkey_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 
 static int pkey_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)

-       {
-       ASN1_OCTET_STRING *hkey = NULL;
-       HMAC_PKEY_CTX *hctx = ctx->data;
-       if (!hctx->ktmp.data)
-               return 0;
-       hkey = ASN1_OCTET_STRING_dup(&hctx->ktmp);
-       if (!hkey)
-               return 0;
-       EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, hkey);
-       
-       return 1;
-       }
-
-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);
-       return 1;
-       }
+{
+    ASN1_OCTET_STRING *hkey = NULL;
+    HMAC_PKEY_CTX *hctx = ctx->data;
+    if (!hctx->ktmp.data)
+        return 0;
+    hkey = ASN1_OCTET_STRING_dup(&hctx->ktmp);
+    if (!hkey)
+        return 0;
+    EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, hkey);
+
+    return 1;
+}
+
+static int int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
+{
+    HMAC_PKEY_CTX *hctx = EVP_MD_CTX_pkey_ctx(ctx)->data;
+    if (!HMAC_Update(hctx->ctx, data, count))
+        return 0;
+    return 1;
+}

 
 static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
 
 static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)

-       {
-       EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
-       mctx->update = int_update;
-       return 1;
-       }
+{
+    HMAC_PKEY_CTX *hctx = ctx->data;
+    HMAC_CTX_set_flags(hctx->ctx,
+                       EVP_MD_CTX_test_flags(mctx, ~EVP_MD_CTX_FLAG_NO_INIT));
+    EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
+    EVP_MD_CTX_set_update_fn(mctx, int_update);
+    return 1;
+}

 
 static int hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 
 static int hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,

-                                       EVP_MD_CTX *mctx)
-       {
-       unsigned int hlen;
-       HMAC_PKEY_CTX *hctx = ctx->data;
-       int l = EVP_MD_CTX_size(mctx);
-
-       if (l < 0)
-               return 0;
-       *siglen = l;
-       if (!sig)
-               return 1;
-
-       HMAC_Final(&hctx->ctx, sig, &hlen);
-       *siglen = (size_t)hlen;
-       return 1;
-       }
+                        EVP_MD_CTX *mctx)
+{
+    unsigned int hlen;
+    HMAC_PKEY_CTX *hctx = ctx->data;
+    int l = EVP_MD_CTX_size(mctx);
+
+    if (l < 0)
+        return 0;
+    *siglen = l;
+    if (!sig)
+        return 1;
+
+    if (!HMAC_Final(hctx->ctx, sig, &hlen))
+        return 0;
+    *siglen = (size_t)hlen;
+    return 1;
+}

 
 static int pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
 static int pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)

-       {
-       HMAC_PKEY_CTX *hctx = ctx->data;
-       ASN1_OCTET_STRING *key;
-       switch (type)
-               {
-
-               case EVP_PKEY_CTRL_SET_MAC_KEY:
-               if ((!p2 && p1 > 0) || (p1 < -1))
-                       return 0;
-               if (!ASN1_OCTET_STRING_set(&hctx->ktmp, p2, p1))
-                       return 0;
-               break;
-
-               case EVP_PKEY_CTRL_MD:
-               hctx->md = p2;
-               break;
-
-               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);
-               break;
-
-               default:
-               return -2;
-
-               }
-       return 1;
-       }
+{
+    HMAC_PKEY_CTX *hctx = ctx->data;
+    ASN1_OCTET_STRING *key;
+    switch (type) {
+
+    case EVP_PKEY_CTRL_SET_MAC_KEY:
+        if ((!p2 && p1 > 0) || (p1 < -1))
+            return 0;
+        if (!ASN1_OCTET_STRING_set(&hctx->ktmp, p2, p1))
+            return 0;
+        break;
+
+    case EVP_PKEY_CTRL_MD:
+        hctx->md = p2;
+        break;
+
+    case EVP_PKEY_CTRL_DIGESTINIT:
+        key = (ASN1_OCTET_STRING *)ctx->pkey->pkey.ptr;
+        if (!HMAC_Init_ex(hctx->ctx, key->data, key->length, hctx->md,
+                          ctx->engine))
+            return 0;
+        break;
+
+    default:
+        return -2;
+
+    }
+    return 1;
+}

 
 static int pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
 
 static int pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx,

-                       const char *type, const char *value)
-       {
-       if (!value)
-               {
-               return 0;
-               }
-       if (!strcmp(type, "key"))
-               {
-               void *p = (void *)value;
-               return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
-                               -1, p);
-               }
-       if (!strcmp(type, "hexkey"))
-               {
-               unsigned char *key;
-               int r;
-               long keylen;
-               key = string_to_hex(value, &keylen);
-               if (!key)
-                       return 0;
-               r = pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key);
-               OPENSSL_free(key);
-               return r;
-               }
-       return -2;
-       }
-
-const EVP_PKEY_METHOD hmac_pkey_meth = 
-       {
-       EVP_PKEY_HMAC,
-       0,
-       pkey_hmac_init,
-       pkey_hmac_copy,
-       pkey_hmac_cleanup,
-
-       0, 0,
-
-       0,
-       pkey_hmac_keygen,
-
-       0, 0,
-
-       0, 0,
-
-       0,0,
-
-       hmac_signctx_init,
-       hmac_signctx,
-
-       0,0,
-
-       0,0,
-
-       0,0,
-
-       0,0,
-
-       pkey_hmac_ctrl,
-       pkey_hmac_ctrl_str
-
-       };
+                              const char *type, const char *value)
+{
+    if (!value) {
+        return 0;
+    }
+    if (strcmp(type, "key") == 0)
+        return EVP_PKEY_CTX_str2ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, value);
+    if (strcmp(type, "hexkey") == 0)
+        return EVP_PKEY_CTX_hex2ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, value);
+    return -2;
+}
+
+const EVP_PKEY_METHOD hmac_pkey_meth = {
+    EVP_PKEY_HMAC,
+    0,
+    pkey_hmac_init,
+    pkey_hmac_copy,
+    pkey_hmac_cleanup,
+
+    0, 0,
+
+    0,
+    pkey_hmac_keygen,
+
+    0, 0,
+
+    0, 0,
+
+    0, 0,
+
+    hmac_signctx_init,
+    hmac_signctx,
+
+    0, 0,
+
+    0, 0,
+
+    0, 0,
+
+    0, 0,
+
+    pkey_hmac_ctrl,
+    pkey_hmac_ctrl_str
+};