aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-04-07 03:34:09 +0100
committerDr. Stephen Henson <steve@openssl.org>2017-05-30 20:38:20 +0100
commitb85236966b8518a23fe87d0d0f7c6cf435cc3878 (patch)
tree3d9912971fb32a74a8ccf2b66517eca80779b4c6
parent1e8c4a9b7a93ecf7936f4fba0632cd82ddfe950a (diff)
downloadopenssl-b85236966b8518a23fe87d0d0f7c6cf435cc3878.tar.gz
Add ED25519 as signature OID
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3503)
-rw-r--r--crypto/objects/obj_xref.h1
-rw-r--r--crypto/objects/obj_xref.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index d09aa71f4e..075907bf44 100644
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -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[] = {
diff --git a/crypto/objects/obj_xref.txt b/crypto/objects/obj_xref.txt
index 981103b36d..c36695c9ab 100644
--- a/crypto/objects/obj_xref.txt
+++ b/crypto/objects/obj_xref.txt
@@ -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.