aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/asn1
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 17:12:30 +0000
committerlloyd <[email protected]>2014-01-18 17:12:30 +0000
commit4917f26a2b154e841cd27c1bcecdd41d2bdeb6ce (patch)
tree0456ae4efcd748ececc83a35a6353373778e1291 /src/lib/asn1
parent560b7671685317035e724b4c75030dc5cf86f461 (diff)
Remove PBES1 entirely
Diffstat (limited to 'src/lib/asn1')
-rw-r--r--src/lib/asn1/oid_lookup/default.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/asn1/oid_lookup/default.cpp b/src/lib/asn1/oid_lookup/default.cpp
index 6904ec0ff..95a700f18 100644
--- a/src/lib/asn1/oid_lookup/default.cpp
+++ b/src/lib/asn1/oid_lookup/default.cpp
@@ -144,12 +144,6 @@ void set_defaults()
OIDS::add_oidstr("2.5.4.65", "X520.Pseudonym");
OIDS::add_oidstr("1.2.840.113549.1.5.12", "PKCS5.PBKDF2");
- OIDS::add_oidstr("1.2.840.113549.1.5.1", "PBE-PKCS5v15(MD2,DES/CBC)");
- OIDS::add_oidstr("1.2.840.113549.1.5.4", "PBE-PKCS5v15(MD2,RC2/CBC)");
- OIDS::add_oidstr("1.2.840.113549.1.5.3", "PBE-PKCS5v15(MD5,DES/CBC)");
- OIDS::add_oidstr("1.2.840.113549.1.5.6", "PBE-PKCS5v15(MD5,RC2/CBC)");
- OIDS::add_oidstr("1.2.840.113549.1.5.10", "PBE-PKCS5v15(SHA-160,DES/CBC)");
- OIDS::add_oidstr("1.2.840.113549.1.5.11", "PBE-PKCS5v15(SHA-160,RC2/CBC)");
OIDS::add_oidstr("1.2.840.113549.1.5.13", "PBE-PKCS5v20");
OIDS::add_oidstr("1.2.840.113549.1.9.1", "PKCS9.EmailAddress");