summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-04-05 14:13:48 +0100
committerDr. Stephen Henson <steve@openssl.org>2017-05-30 20:38:19 +0100
commit9691a749c8c694fa212bfd8a93ae91786ab463af (patch)
treec12a66c102cb78da785fd2d7daea206db23ac5a7 /crypto/objects/objects.txt
parentd4d001df371f2ccd13eee7f9d7f4c6594a080168 (diff)
Add EdDSA algorithm OIDs from draft-ietf-curdle-pkix-04
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3503)
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r--crypto/objects/objects.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index ceb03a36e2..324b63aab5 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1494,9 +1494,12 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
id-pkinit 4 : pkInitClientAuth : PKINIT Client Auth
id-pkinit 5 : pkInitKDC : Signing KDC Response
-# New curves from draft-ietf-curdle-pkix-00
+# New algorithms from draft-ietf-curdle-pkix-04
1 3 101 110 : X25519
1 3 101 111 : X448
+1 3 101 112 : ED25519
+1 3 101 113 : ED448
+
# NIDs for cipher key exchange
: KxRSA : kx-rsa