diff options
author | miod <> | 2014-05-01 11:13:26 +0000 |
---|---|---|
committer | miod <> | 2014-05-01 11:13:26 +0000 |
commit | 635e6748cf54c09f2dda8a991718ce3200f92820 (patch) | |
tree | 0b142170acda35ae0be937aafceb4d49610c5856 /src/lib/libcrypto/objects | |
parent | 7b03fe01b152af99e43b7fc69af8ce116432c5ec (diff) | |
download | openbsd-635e6748cf54c09f2dda8a991718ce3200f92820.tar.gz openbsd-635e6748cf54c09f2dda8a991718ce3200f92820.tar.bz2 openbsd-635e6748cf54c09f2dda8a991718ce3200f92820.zip |
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 'src/lib/libcrypto/objects')
-rw-r--r-- | src/lib/libcrypto/objects/objects.txt | 17 |
1 files changed, 17 insertions, 0 deletions
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 | |||
1290 | : AES-128-CBC-HMAC-SHA1 : aes-128-cbc-hmac-sha1 | 1290 | : AES-128-CBC-HMAC-SHA1 : aes-128-cbc-hmac-sha1 |
1291 | : AES-192-CBC-HMAC-SHA1 : aes-192-cbc-hmac-sha1 | 1291 | : AES-192-CBC-HMAC-SHA1 : aes-192-cbc-hmac-sha1 |
1292 | : AES-256-CBC-HMAC-SHA1 : aes-256-cbc-hmac-sha1 | 1292 | : AES-256-CBC-HMAC-SHA1 : aes-256-cbc-hmac-sha1 |
1293 | |||
1294 | identified-organization 36 : teletrust | ||
1295 | teletrust 3 3 2 8 1 : brainpool | ||
1296 | brainpool 1 1 : brainpoolP160r1 | ||
1297 | brainpool 1 2 : brainpoolP160t1 | ||
1298 | brainpool 1 3 : brainpoolP192r1 | ||
1299 | brainpool 1 4 : brainpoolP192t1 | ||
1300 | brainpool 1 5 : brainpoolP224r1 | ||
1301 | brainpool 1 6 : brainpoolP224t1 | ||
1302 | brainpool 1 7 : brainpoolP256r1 | ||
1303 | brainpool 1 8 : brainpoolP256t1 | ||
1304 | brainpool 1 9 : brainpoolP320r1 | ||
1305 | brainpool 1 10 : brainpoolP320t1 | ||
1306 | brainpool 1 11 : brainpoolP384r1 | ||
1307 | brainpool 1 12 : brainpoolP384t1 | ||
1308 | brainpool 1 13 : brainpoolP512r1 | ||
1309 | brainpool 1 14 : brainpoolP512t1 | ||