From: jsing <jsing@openbsd.org>
Date: Thu, 10 Nov 2022 16:04:31 +0000 (+0000)
Subject: Map objects for ED25519 to Ed25519.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d39f31be08476af84e7cd8e11171445b51978ef2;p=openbsd

Map objects for ED25519 to Ed25519.

OpenSSL used ED25519, even though the RFCs use Ed25519 - as such, we get to
provide both.

ok tb@
---

diff --git a/lib/libcrypto/objects/objects.h b/lib/libcrypto/objects/objects.h
index fe3d7774d30..ef9a9e6f0c5 100644
--- a/lib/libcrypto/objects/objects.h
+++ b/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.18 2022/07/12 14:42:49 kn Exp $ */
+/* $OpenBSD: objects.h,v 1.19 2022/11/10 16:04:31 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -956,6 +956,12 @@
 #define OBJ_OCSP_sign			OBJ_id_kp,9L
 #endif /* USE_OBJ_MAC */
 
+#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
+#define SN_ED25519			SN_Ed25519
+#define NID_ED25519			NID_Ed25519
+#define OBJ_ED25519			OBJ_Ed25519
+#endif
+
 #include <openssl/bio.h>
 #include <openssl/asn1.h>