From 9dd0367cf85a93773fcf58bec09bb287c3249477 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Thu, 1 May 2014 11:13:26 +0000
Subject: Add Brainpool elliptic curves. From OpenSSL RT#2239 via ${DAYJOB}. Be
 sure to rerun `make includes' after updating. ok tedu@ beck@ deraadt@

---
 src/lib/libcrypto/objects/objects.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/lib/libcrypto/objects/objects.txt')

diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
index d3bfad72a2..04939e7ead 100644
--- a/src/lib/libcrypto/objects/objects.txt
+++ b/src/lib/libcrypto/objects/objects.txt
@@ -1290,3 +1290,20 @@ kisa 1 6                : SEED-OFB      : seed-ofb
 			: AES-128-CBC-HMAC-SHA1		: aes-128-cbc-hmac-sha1
 			: AES-192-CBC-HMAC-SHA1		: aes-192-cbc-hmac-sha1
 			: AES-256-CBC-HMAC-SHA1		: aes-256-cbc-hmac-sha1
+
+identified-organization 36		: teletrust
+teletrust 3 3 2 8 1 : brainpool
+brainpool 1 1 : brainpoolP160r1
+brainpool 1 2 : brainpoolP160t1
+brainpool 1 3 : brainpoolP192r1
+brainpool 1 4 : brainpoolP192t1
+brainpool 1 5 : brainpoolP224r1
+brainpool 1 6 : brainpoolP224t1
+brainpool 1 7 : brainpoolP256r1
+brainpool 1 8 : brainpoolP256t1
+brainpool 1 9 : brainpoolP320r1
+brainpool 1 10 : brainpoolP320t1
+brainpool 1 11 : brainpoolP384r1
+brainpool 1 12 : brainpoolP384t1
+brainpool 1 13 : brainpoolP512r1
+brainpool 1 14 : brainpoolP512t1
-- 
cgit v1.2.3-55-g6feb