From eca0318fe8f12ad790e8f444840fbb879ee3c36d Mon Sep 17 00:00:00 2001
From: Bill Phipps <bill@wolfssl.com>
Date: Mon, 14 Apr 2025 09:43:55 -0400
Subject: [PATCH] Rename to MAX_KEY_TO_DER_SZ, set to 130. Remove Curve448
 changes.

---
 tests/api/test_curve448.c      | 2 +-
 wolfcrypt/test/test.c          | 2 +-
 wolfssl/wolfcrypt/curve25519.h | 2 +-
 wolfssl/wolfcrypt/curve448.h   | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/api/test_curve448.c b/tests/api/test_curve448.c
index 584b76525..0ae3736a8 100644
--- a/tests/api/test_curve448.c
+++ b/tests/api/test_curve448.c
@@ -347,7 +347,7 @@ int test_wc_Curve448PrivateKeyToDer(void)
     EXPECT_DECLS;
 #if defined(HAVE_CURVE448) && defined(HAVE_CURVE448_KEY_EXPORT) && \
     (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
-    byte      output[CURVE448_BUFSIZE];
+    byte      output[ONEK_BUF];
     curve448_key curve448PrivKey;
     WC_RNG    rng;
     word32    inLen;
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index d54164668..a68619fc5 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -35544,7 +35544,7 @@ static wc_test_ret_t curve255519_der_test(void)
         0xA2, 0x5B, 0x38, 0xFD, 0x96, 0xDB, 0x2A, 0x26
     };
     curve25519_key key;
-    byte output[CURVE25519_BUFSIZE];
+    byte output[CURVE25519_MAX_KEY_TO_DER_SZ];
     word32 outputSz = (word32)sizeof(output);
     word32 idx;
 
diff --git a/wolfssl/wolfcrypt/curve25519.h b/wolfssl/wolfcrypt/curve25519.h
index c2ff16cc3..acdb9574a 100644
--- a/wolfssl/wolfcrypt/curve25519.h
+++ b/wolfssl/wolfcrypt/curve25519.h
@@ -46,7 +46,7 @@
 #define CURVE25519_PUB_KEY_SIZE 32
 
 enum {
-    CURVE25519_BUFSIZE = 128,  /* for exported DER keys temp buffer */
+    CURVE25519_MAX_KEY_TO_DER_SZ = 82,  /* for exported DER keys temp buffer */
 
     WOLF_ENUM_DUMMY_LAST_ELEMENT(CURVE25519)
 };
diff --git a/wolfssl/wolfcrypt/curve448.h b/wolfssl/wolfcrypt/curve448.h
index a7ddd454b..756c8a3d5 100644
--- a/wolfssl/wolfcrypt/curve448.h
+++ b/wolfssl/wolfcrypt/curve448.h
@@ -43,12 +43,6 @@
 #define CURVE448_KEY_SIZE        56
 #define CURVE448_PUB_KEY_SIZE    56
 
-enum {
-    CURVE448_BUFSIZE = 256,  /* for DER exported keys temp buffer */
-
-    WOLF_ENUM_DUMMY_LAST_ELEMENT(CURVE448)
-};
-
 #ifndef WC_CURVE448KEY_TYPE_DEFINED
     typedef struct curve448_key curve448_key;
     #define WC_CURVE448KEY_TYPE_DEFINED