aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pubkey/pbes2
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-10-22 00:51:13 -0400
committerJack Lloyd <[email protected]>2016-11-03 11:56:50 -0400
commit62e55f484a7a03e2532875696eb2479a577878e9 (patch)
tree71c86436d9c3dd2059f7d0024f204e66e535b2b2 /src/lib/pubkey/pbes2
parentb1021ca76bb3c47b1b520421ccece38d772e5907 (diff)
Remove ability to add OIDS at runtime. Remove global OID lock.
OID map is now generated from an input file on an as needed basis. Just uses a sequence of ifs - simple, fast, and small code size. Merges oid_lookup sub-module which was already required by asn1 anyway, so completely non-optional. Removes @neusdan's nice OID tests since without any runtime adds the tests are moot.
Diffstat (limited to 'src/lib/pubkey/pbes2')
-rw-r--r--src/lib/pubkey/pbes2/info.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/pubkey/pbes2/info.txt b/src/lib/pubkey/pbes2/info.txt
index ed88ac3eb..8a42e4133 100644
--- a/src/lib/pubkey/pbes2/info.txt
+++ b/src/lib/pubkey/pbes2/info.txt
@@ -4,6 +4,5 @@ define PKCS5_PBES2 20141119
asn1
cbc
hmac
-oid_lookup
pbkdf2
</requires>