diff options
author | Jack Lloyd <[email protected]> | 2016-10-24 12:37:35 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-10-24 12:37:35 -0400 |
commit | c7e76399055c792b84071f22c490906576bd4027 (patch) | |
tree | 1e70ece726c42755573b876eae9b060337ef0e80 /src/lib/pk_pad/emsa_pssr | |
parent | de54f69aa74d98664fb13b0097f61e17322bca04 (diff) | |
parent | 331f7d28de21170e74febae53a7f49732ad40256 (diff) |
Merge GH #668: Remove Algo_Registry and associated global locks
Diffstat (limited to 'src/lib/pk_pad/emsa_pssr')
-rw-r--r-- | src/lib/pk_pad/emsa_pssr/pssr.cpp | 14 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa_pssr/pssr.h | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.cpp b/src/lib/pk_pad/emsa_pssr/pssr.cpp index ddd8c5f0b..a41e79e78 100644 --- a/src/lib/pk_pad/emsa_pssr/pssr.cpp +++ b/src/lib/pk_pad/emsa_pssr/pssr.cpp @@ -11,20 +11,6 @@ namespace Botan { -PSSR* PSSR::make(const Spec& request) - { - if(request.arg(1, "MGF1") != "MGF1") - return nullptr; - - if(auto h = HashFunction::create(request.arg(0))) - { - const size_t salt_size = request.arg_as_integer(2, h->output_length()); - return new PSSR(h.release(), salt_size); - } - - return nullptr; - } - /* * PSSR Update Operation */ diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h index fa8687fee..bf465eadf 100644 --- a/src/lib/pk_pad/emsa_pssr/pssr.h +++ b/src/lib/pk_pad/emsa_pssr/pssr.h @@ -32,8 +32,6 @@ class BOTAN_DLL PSSR final : public EMSA PSSR(HashFunction* hash, size_t salt_size); EMSA* clone() override { return new PSSR(m_hash->clone(), m_SALT_SIZE); } - - static PSSR* make(const Spec& spec); private: void update(const byte input[], size_t length) override; |