From 840fc0e4dfcb9578b9b1bfd3da0b8fd8a1fa8534 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 19 Nov 2014 12:45:07 +0000 Subject: Cleanup PBES2 and add GCM support --- src/lib/asn1/oid_lookup/default.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/lib/asn1/oid_lookup/default.cpp') diff --git a/src/lib/asn1/oid_lookup/default.cpp b/src/lib/asn1/oid_lookup/default.cpp index 95a700f18..490b621fd 100644 --- a/src/lib/asn1/oid_lookup/default.cpp +++ b/src/lib/asn1/oid_lookup/default.cpp @@ -49,6 +49,11 @@ void set_defaults() OIDS::add_oidstr("2.16.840.1.101.3.4.1.42", "AES-256/CBC"); 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("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"); /* Hash Functions */ OIDS::add_oidstr("1.2.840.113549.2.5", "MD5"); -- cgit v1.2.3