summaryrefslogtreecommitdiff
path: root/lib/libcrypto/objects/objects.txt
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-05-01 11:13:27 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-05-01 11:13:27 +0000
commite71d5db02dd30a9e21a7e61db4de1c07a3184a83 (patch)
treec031854ccf269c6fd78434b48c4ac41a7f1614cd /lib/libcrypto/objects/objects.txt
parentbebaae60783f7988082ec33b18fa51ce18890230 (diff)
Add Brainpool elliptic curves. From OpenSSL RT#2239 via ${DAYJOB}.
Be sure to rerun `make includes' after updating. ok tedu@ beck@ deraadt@
Diffstat (limited to 'lib/libcrypto/objects/objects.txt')
-rw-r--r--lib/libcrypto/objects/objects.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/libcrypto/objects/objects.txt b/lib/libcrypto/objects/objects.txt
index d3bfad72a2a..04939e7ead7 100644
--- a/lib/libcrypto/objects/objects.txt
+++ b/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