summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2022-11-10 16:04:31 +0000
committerjsing <>2022-11-10 16:04:31 +0000
commitf1b3350fd448b86c5952884eb0388b3edcf9deb1 (patch)
tree768794e0f741db984b642c0d3de301645b044e86 /src/lib
parentb954afe7ca8ab9957891c320c2769cd2aa136bb0 (diff)
downloadopenbsd-f1b3350fd448b86c5952884eb0388b3edcf9deb1.tar.gz
openbsd-f1b3350fd448b86c5952884eb0388b3edcf9deb1.tar.bz2
openbsd-f1b3350fd448b86c5952884eb0388b3edcf9deb1.zip
Map objects for ED25519 to Ed25519.
OpenSSL used ED25519, even though the RFCs use Ed25519 - as such, we get to provide both. ok tb@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/objects/objects.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index fe3d7774d3..ef9a9e6f0c 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: objects.h,v 1.18 2022/07/12 14:42:49 kn Exp $ */ 1/* $OpenBSD: objects.h,v 1.19 2022/11/10 16:04:31 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -956,6 +956,12 @@
956#define OBJ_OCSP_sign OBJ_id_kp,9L 956#define OBJ_OCSP_sign OBJ_id_kp,9L
957#endif /* USE_OBJ_MAC */ 957#endif /* USE_OBJ_MAC */
958 958
959#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
960#define SN_ED25519 SN_Ed25519
961#define NID_ED25519 NID_Ed25519
962#define OBJ_ED25519 OBJ_Ed25519
963#endif
964
959#include <openssl/bio.h> 965#include <openssl/bio.h>
960#include <openssl/asn1.h> 966#include <openssl/asn1.h>
961 967