aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-11-29 14:27:23 +0000
committerlloyd <[email protected]>2014-11-29 14:27:23 +0000
commit1652aab693b804ab2243b062b1463da90aa33eab (patch)
tree4b3179b2ca9a02e1cf4f62af7d5b5e8853eb1ff6 /src
parente89b6a365e56283a945aeda8ed2b427937fe5d91 (diff)
Add OIDs for Twofish, Serpent, and McEliece
Diffstat (limited to 'src')
-rw-r--r--src/lib/asn1/oid_lookup/default.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/asn1/oid_lookup/default.cpp b/src/lib/asn1/oid_lookup/default.cpp
index 490b621fd..54e834439 100644
--- a/src/lib/asn1/oid_lookup/default.cpp
+++ b/src/lib/asn1/oid_lookup/default.cpp
@@ -24,6 +24,7 @@ void set_defaults()
OIDS::add_oidstr("1.3.6.1.4.1.3029.1.2.1", "ElGamal");
OIDS::add_oidstr("1.3.6.1.4.1.25258.1.1", "RW");
OIDS::add_oidstr("1.3.6.1.4.1.25258.1.2", "NR");
+ OIDS::add_oidstr("1.3.6.1.4.1.25258.1.3", "McEliece/BIGGF2M");
// X9.62 ecPublicKey, valid for ECDSA and ECDH (RFC 3279 sec 2.3.5)
OIDS::add_oidstr("1.2.840.10045.2.1", "ECDSA");
@@ -50,10 +51,13 @@ void set_defaults()
OIDS::add_oidstr("1.2.410.200004.1.4", "SEED/CBC"); // RFC 4010
OIDS::add_oidstr("1.3.6.1.4.1.25258.3.1", "Serpent/CBC");
OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2", "Threefish-512/CBC");
+ OIDS::add_oidstr("1.3.6.1.4.1.25258.3.3", "Twofish/CBC");
OIDS::add_oidstr("2.16.840.1.101.3.4.1.6", "AES-128/GCM");
OIDS::add_oidstr("2.16.840.1.101.3.4.1.26", "AES-192/GCM");
OIDS::add_oidstr("2.16.840.1.101.3.4.1.46", "AES-256/GCM");
+ OIDS::add_oidstr("1.3.6.1.4.1.25258.3.101", "Serpent/GCM");
+ OIDS::add_oidstr("1.3.6.1.4.1.25258.3.102", "Twofish/GCM");
/* Hash Functions */
OIDS::add_oidstr("1.2.840.113549.2.5", "MD5");