From 3deb5afd0a0dc2544bc4b40d483329904ef852b1 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 5 Nov 2016 20:01:54 +0000
Subject: Add objects for X25519, X448, Ed25519 and Ed448.

ok miod@
---
 src/lib/libcrypto/objects/obj_mac.num | 6 ++++++
 src/lib/libcrypto/objects/objects.txt | 9 +++++++++
 2 files changed, 15 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index d3a658e59c..d839b396f2 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -947,3 +947,9 @@ id_tc26_gost3410_2012_256		946
 id_tc26_gost3410_2012_512		947
 id_tc26_signwithdigest_gost3410_2012_256		948
 id_tc26_signwithdigest_gost3410_2012_512		949
+X25519		950
+X448		951
+Ed25519		952
+Ed448		953
+Ed25519ph	954
+Ed448ph		955
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
index 1ce73cc984..d7b2d39e51 100644
--- a/src/lib/libcrypto/objects/objects.txt
+++ b/src/lib/libcrypto/objects/objects.txt
@@ -1313,6 +1313,7 @@ brainpool 1 14 : brainpoolP512t1
 # ChaCha Stream Cipher
 !Cname chacha20
 			: ChaCha		: chacha
+
 			: gost89-ecb
 			: gost89-cbc
 
@@ -1328,3 +1329,11 @@ tc26 1 1 1		: id-tc26-gost3410-2012-256 : GOST R 34.10-2012 (256 bit)
 tc26 1 1 2		: id-tc26-gost3410-2012-512 : GOST R 34.10-2012 (512 bit)
 tc26 1 3 2		: id-tc26-signwithdigest-gost3410-2012-256 : GOST R 34.11-2012 with GOST R 34.10-2012 (256 bit)
 tc26 1 3 3		: id-tc26-signwithdigest-gost3410-2012-512 : GOST R 34.11-2012 with GOST R 34.10-2012 (512 bit)
+
+# Curves from draft-ietf-curdle-pkix-02
+1 3 101 110		: X25519
+1 3 101 111		: X448
+1 3 101 112		: Ed25519
+1 3 101 113		: Ed448
+1 3 101 114		: Ed25519ph
+1 3 101 115		: Ed448ph
-- 
cgit v1.2.3-55-g6feb