diff options
| author | Jack Lloyd <[email protected]> | 2020-11-06 09:53:39 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-11-06 09:53:39 -0500 |
| commit | 7c27982e27b953682554de3c4b22843e0e7461e7 (patch) | |
| tree | 74480b4685262e52fda467c64cedf9d2031b0c6e /src/lib/pbkdf/pbkdf.cpp | |
| parent | 332c2c088465f3e0e5fe498ba08dcc31a3e9cbd8 (diff) | |
| parent | 76c1b92f320cee8a13c2071e3325d10bb1d7190d (diff) | |
Merge GH #2434 Remove deprecated algorithms
Diffstat (limited to 'src/lib/pbkdf/pbkdf.cpp')
| -rw-r--r-- | src/lib/pbkdf/pbkdf.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/lib/pbkdf/pbkdf.cpp b/src/lib/pbkdf/pbkdf.cpp index 73b482725..1434ec183 100644 --- a/src/lib/pbkdf/pbkdf.cpp +++ b/src/lib/pbkdf/pbkdf.cpp @@ -9,10 +9,6 @@ #include <botan/exceptn.h> #include <botan/scan_name.h> -#if defined(BOTAN_HAS_PBKDF1) -#include <botan/pbkdf1.h> -#endif - #if defined(BOTAN_HAS_PBKDF2) #include <botan/pbkdf2.h> #endif @@ -46,15 +42,6 @@ std::unique_ptr<PBKDF> PBKDF::create(const std::string& algo_spec, } #endif -#if defined(BOTAN_HAS_PBKDF1) - if(req.algo_name() == "PBKDF1" && req.arg_count() == 1) - { - if(auto hash = HashFunction::create(req.arg(0))) - return std::unique_ptr<PBKDF>(new PKCS5_PBKDF1(hash.release())); - - } -#endif - #if defined(BOTAN_HAS_PGP_S2K) if(req.algo_name() == "OpenPGP-S2K" && req.arg_count() == 1) { |