From b7d88e0852eae9bbd819a925ca18e22df480c306 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Mon, 11 Mar 2024 13:58:26 -0400
Subject: [PATCH] Cleanup duplicate forward dec logic with different macros

---
 wolfssl/wolfcrypt/ed25519.h | 9 ++-------
 wolfssl/wolfcrypt/ed448.h   | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/wolfssl/wolfcrypt/ed25519.h b/wolfssl/wolfcrypt/ed25519.h
index af73f3af0..efba65020 100644
--- a/wolfssl/wolfcrypt/ed25519.h
+++ b/wolfssl/wolfcrypt/ed25519.h
@@ -74,11 +74,6 @@ enum {
     Ed25519ph  = 1
 };
 
-#ifndef WC_ED25519KEY_TYPE_DEFINED
-    typedef struct ed25519_key ed25519_key;
-    #define WC_ED25519KEY_TYPE_DEFINED
-#endif
-
 /* ED25519 Flags */
 enum {
     WC_ED25519_FLAG_NONE     = 0x00,
@@ -115,9 +110,9 @@ struct ed25519_key {
 #endif
 };
 
-#ifndef WC_ED25519_TYPE_DEFINED
+#ifndef WC_ED25519KEY_TYPE_DEFINED
     typedef struct ed25519_key ed25519_key;
-    #define WC_ED25519_TYPE_DEFINED
+    #define WC_ED25519KEY_TYPE_DEFINED
 #endif
 
 
diff --git a/wolfssl/wolfcrypt/ed448.h b/wolfssl/wolfcrypt/ed448.h
index c60e10b7b..5884bda13 100644
--- a/wolfssl/wolfcrypt/ed448.h
+++ b/wolfssl/wolfcrypt/ed448.h
@@ -76,11 +76,6 @@ enum {
     Ed448ph  = 1
 };
 
-#ifndef WC_ED448KEY_TYPE_DEFINED
-    typedef struct ed448_key ed448_key;
-    #define WC_ED448KEY_TYPE_DEFINED
-#endif
-
 /* An ED448 Key */
 struct ed448_key {
     byte    p[ED448_PUB_KEY_SIZE]; /* compressed public key */
@@ -106,9 +101,9 @@ struct ed448_key {
 #endif
 };
 
-#ifndef WC_ED448_TYPE_DEFINED
+#ifndef WC_ED448KEY_TYPE_DEFINED
     typedef struct ed448_key ed448_key;
-    #define WC_ED448_TYPE_DEFINED
+    #define WC_ED448KEY_TYPE_DEFINED
 #endif
 
 WOLFSSL_API