From: Pauli <paul.dale@oracle.com>
Date: Thu, 9 Aug 2018 22:41:00 +0000 (+1000)
Subject: Change the OID references for X25519, X448, ED25519 and ED448 from the draft RFC
X-Git-Tag: OpenSSL_1_1_1-pre9~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0d0e8a71918816f7039f1f5443ebb3e28c06393;p=oweals%2Fopenssl.git

Change the OID references for X25519, X448, ED25519 and ED448 from the draft RFC
to the now released RFC 8410.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6910)
---

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index f6b5f33d8c..6dbc41ce37 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1605,7 +1605,7 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 id-pkinit 4                     : pkInitClientAuth      : PKINIT Client Auth
 id-pkinit 5                     : pkInitKDC             : Signing KDC Response
 
-# New algorithms from draft-ietf-curdle-pkix-04
+# From RFC8410
 1 3 101 110 : X25519
 1 3 101 111 : X448
 1 3 101 112 : ED25519