diff options
| author | lloyd <[email protected]> | 2014-12-27 18:05:03 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-12-27 18:05:03 +0000 |
| commit | 223ef5ef234a9534e7b71c4738788299755b654e (patch) | |
| tree | c9a3314a31df65c9c58c2e7caa2f7d1bf7ff8abe /src/lib/asn1/oid_lookup | |
| parent | d0daf875978848c3edf65c7b3683a21605f72e64 (diff) | |
When encrypting McEliece or Curve25519 keys, default to GCM instead of CBC.
Add OIDS for OCB mode with various ciphers.
Diffstat (limited to 'src/lib/asn1/oid_lookup')
| -rw-r--r-- | src/lib/asn1/oid_lookup/default.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/asn1/oid_lookup/default.cpp b/src/lib/asn1/oid_lookup/default.cpp index 54e834439..03b1be99f 100644 --- a/src/lib/asn1/oid_lookup/default.cpp +++ b/src/lib/asn1/oid_lookup/default.cpp @@ -1,6 +1,6 @@ /* * OID Registry -* (C) 1999-2010,2013 Jack Lloyd +* (C) 1999-2010,2013,2014 Jack Lloyd * * Distributed under the terms of the Botan license */ @@ -24,7 +24,8 @@ 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"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.1.3", "McEliece"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.1.4", "Curve25519"); // X9.62 ecPublicKey, valid for ECDSA and ECDH (RFC 3279 sec 2.3.5) OIDS::add_oidstr("1.2.840.10045.2.1", "ECDSA"); @@ -59,6 +60,12 @@ void set_defaults() 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"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2.1", "AES-128/OCB"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2.2", "AES-192/OCB"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2.3", "AES-256/OCB"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2.4", "Serpent/OCB"); + OIDS::add_oidstr("1.3.6.1.4.1.25258.3.2.5", "Twofish/OCB"); + /* Hash Functions */ OIDS::add_oidstr("1.2.840.113549.2.5", "MD5"); OIDS::add_oidstr("1.3.6.1.4.1.11591.12.2", "Tiger(24,3)"); |