Add ED25519 as signature OID
authorDr. Stephen Henson <steve@openssl.org>
Fri, 7 Apr 2017 02:34:09 +0000 (03:34 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 30 May 2017 19:38:20 +0000 (20:38 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3503)

crypto/objects/obj_xref.h
crypto/objects/obj_xref.txt

index d09aa71..075907b 100644 (file)
@@ -73,6 +73,7 @@ static const nid_triple sigoid_srt[] = {
      NID_id_GostR3410_2012_256},
     {NID_id_tc26_signwithdigest_gost3410_2012_512, NID_id_GostR3411_2012_512,
      NID_id_GostR3410_2012_512},
+    {NID_ED25519, NID_undef, NID_ED25519},
 };
 
 static const nid_triple *const sigoid_srt_xref[] = {
index 981103b..c36695c 100644 (file)
@@ -17,6 +17,7 @@ ripemd160WithRSA      ripemd160 rsaEncryption
 # AlgorithmIdentifier. The digest "undef" indicates the public key
 # method should handle this explicitly.
 rsassaPss              undef   rsaEncryption
+ED25519                    undef       ED25519
 
 # Alternative deprecated OIDs. By using the older "rsa" OID this
 # type will be recognized by not normally used.