[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  d0d0e8a71918816f7039f1f5443ebb3e28c06393 (commit)
      from  345bee916ac5ad28dd269afc24c27fe234c4045b (commit)


- Log -----------------------------------------------------------------
commit d0d0e8a71918816f7039f1f5443ebb3e28c06393
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Aug 10 08:41:00 2018 +1000

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6910)

-----------------------------------------------------------------------

Summary of changes:
 crypto/objects/objects.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index f6b5f33..6dbc41c 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