commit b3831fbb0bf63f77ce45e359b5031cd3f6c56fa2
author Matt Caswell <matt@openssl.org> Mon Mar 05 17:23:57 2018 +0000
committer Matt Caswell <matt@openssl.org> Thu Mar 15 12:47:27 2018 +0000
tree ddb7879726c179e4edf7ae9a12bd2ed3091bed95
parent 2621c8479e468d29419640c2bd900786612b4ade

Add the function EVP_PKEY_new_CMAC_key()

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5520)

crypto/evp/p_lib.c

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index a92b169..ee121c4 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -18,6 +18,7 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
+#include <openssl/cmac.h>
 #include <openssl/engine.h>
 
 #include "internal/asn1_int.h"
@@ -279,6 +280,33 @@
     return NULL;
 }
 
+EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv,
+                                size_t len, const EVP_CIPHER *cipher)
+{
+    EVP_PKEY *ret = EVP_PKEY_new();
+    CMAC_CTX *cmctx = CMAC_CTX_new();
+
+    if (ret == NULL
+            || cmctx == NULL
+            || !pkey_set_type(ret, e, EVP_PKEY_CMAC, NULL, -1)) {
+        /* EVPerr already called */
+        goto err;
+    }
+
+    if (!CMAC_Init(cmctx, priv, len, cipher, e)) {
+        EVPerr(EVP_F_EVP_PKEY_NEW_CMAC_KEY, EVP_R_KEY_SETUP_FAILED);
+        goto err;
+    }
+
+    ret->pkey.ptr = cmctx;
+    return ret;
+
+ err:
+    EVP_PKEY_free(ret);
+    CMAC_CTX_free(cmctx);
+    return NULL;
+
+}
 
 int EVP_PKEY_set_type(EVP_PKEY *pkey, int type)
 {