From 01f300463a9cfc0059aabe3087edb65e8ae07e40 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Wed, 31 Mar 2021 16:47:00 +0000
Subject: [PATCH] Provide EVP_PKEY_new_CMAC_key(3)

ok bcook inoguchi jsing
---
 lib/libcrypto/Symbols.list | 1 +
 lib/libcrypto/evp/evp.h    | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 662eb4dc291..ca8e371ff64 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1587,6 +1587,7 @@ EVP_PKEY_meth_set_verify_recover
 EVP_PKEY_meth_set_verifyctx
 EVP_PKEY_missing_parameters
 EVP_PKEY_new
+EVP_PKEY_new_CMAC_key
 EVP_PKEY_new_mac_key
 EVP_PKEY_paramgen
 EVP_PKEY_paramgen_init
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h
index ca51429fa0c..e8a6eea035f 100644
--- a/lib/libcrypto/evp/evp.h
+++ b/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp.h,v 1.80 2021/03/29 15:57:23 tb Exp $ */
+/* $OpenBSD: evp.h,v 1.81 2021/03/31 16:47:01 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1149,10 +1149,8 @@ void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
 
 EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key,
     int keylen);
-#if defined(LIBRESSL_INTERNAL)
 EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv,
     size_t len, const EVP_CIPHER *cipher);
-#endif
 
 void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
 void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
@@ -1516,9 +1514,7 @@ void ERR_load_EVP_strings(void);
 #define EVP_R_INVALID_OPERATION				 148
 #define EVP_R_IV_TOO_LARGE				 102
 #define EVP_R_KEYGEN_FAILURE				 120
-#if defined(LIBRESSL_INTERNAL)
 #define EVP_R_KEY_SETUP_FAILED				 180
-#endif
 #define EVP_R_MESSAGE_DIGEST_IS_NULL			 159
 #define EVP_R_METHOD_NOT_SUPPORTED			 144
 #define EVP_R_MISSING_PARAMETERS			 103
-- 
2.20.1