From b39e1ef5f66f7e114c5727439e2227bc213467a0 Mon Sep 17 00:00:00 2001
From: smfc99 <147594567+smfc99@users.noreply.github.com>
Date: Mon, 14 Oct 2024 19:38:00 +0800
Subject: [PATCH 1/2] Resolves naming conflicts between variable names and c++
 identifiers-"new"

---
 include/crypto/evp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/crypto/evp.h b/include/crypto/evp.h
index b562a37a1..e7eec905d 100644
--- a/include/crypto/evp.h
+++ b/include/crypto/evp.h
@@ -137,7 +137,7 @@ extern const EVP_PKEY_METHOD eia3_pkey_meth;
 typedef struct evp_kdf_impl_st EVP_KDF_IMPL;
 typedef struct {
     int type;
-    EVP_KDF_IMPL *(*new) (void);
+    EVP_KDF_IMPL *(*new_impl) (void);
     void (*free) (EVP_KDF_IMPL *impl);
     void (*reset) (EVP_KDF_IMPL *impl);
     int (*ctrl) (EVP_KDF_IMPL *impl, int cmd, va_list args);

From 6a366a8398c31ff80b546504df44502652fb38b4 Mon Sep 17 00:00:00 2001
From: smfc99 <147594567+smfc99@users.noreply.github.com>
Date: Mon, 14 Oct 2024 19:38:47 +0800
Subject: [PATCH 2/2] Resolves naming conflicts between variable names and c++
 identifiers-"new"

---
 crypto/evp/kdf_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index f07771605..186368b0e 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -79,7 +79,7 @@ EVP_KDF_CTX *EVP_KDF_CTX_new_id(int id)
         return NULL;
     }
 
-    if (kmeth->new != NULL && (ret->impl = kmeth->new()) == NULL) {
+    if (kmeth->new_impl != NULL && (ret->impl = kmeth->new_impl()) == NULL) {
         EVP_KDF_CTX_free(ret);
         return NULL;
     }