diff options
author | Daniel Neus <[email protected]> | 2016-04-30 16:33:31 +0200 |
---|---|---|
committer | Daniel Neus <[email protected]> | 2016-04-30 16:33:31 +0200 |
commit | 7c85cf078445841699b67d12b3baec011bd129f6 (patch) | |
tree | e0e22348f1bd479c0c5754a488421e71e8b9cc4e | |
parent | e6f56a82b639776282b9f4fd6a66e426ea0910d2 (diff) |
remove EMSA1_BSI (no longer recommended by BSI)
-rw-r--r-- | src/build-data/policy/bsi.txt | 6 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp | 29 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h | 35 | ||||
-rw-r--r-- | src/lib/pk_pad/emsa1_bsi/info.txt | 5 |
4 files changed, 5 insertions, 70 deletions
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt index b8d47a5fd..67d929c3c 100644 --- a/src/build-data/policy/bsi.txt +++ b/src/build-data/policy/bsi.txt @@ -57,9 +57,11 @@ hres_timer proc_walk rdrand rdseed -system_rng win32_stats +# rng +system_rng + # utils locking_allocator simd_altivec @@ -152,6 +154,8 @@ x919_mac # rng x931_rng + +# entropy sources unix_procs </prohibited> diff --git a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp deleted file mode 100644 index 5fc96da8d..000000000 --- a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* -* EMSA1 BSI -* (C) 1999-2008 Jack Lloyd -* 2008 Falko Strenzke, FlexSecure GmbH -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ - -#include <botan/emsa1_bsi.h> - -namespace Botan { - -/* -* EMSA1 BSI Encode Operation -*/ -secure_vector<byte> EMSA1_BSI::encoding_of(const secure_vector<byte>& msg, - size_t output_bits, - RandomNumberGenerator&) - { - if(msg.size() != hash_output_length()) - throw Encoding_Error("EMSA1_BSI::encoding_of: Invalid size for input"); - - if(8*msg.size() <= output_bits) - return msg; - - throw Encoding_Error("EMSA1_BSI::encoding_of: max key input size exceeded"); - } - -} diff --git a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h deleted file mode 100644 index a7fae6c23..000000000 --- a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -* EMSA1 BSI Variant -* (C) 1999-2008 Jack Lloyd -* 2007 FlexSecure GmbH -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ - -#ifndef BOTAN_EMSA1_BSI_H__ -#define BOTAN_EMSA1_BSI_H__ - -#include <botan/emsa1.h> - -namespace Botan { - -/** -* EMSA1_BSI is a variant of EMSA1 specified by the BSI. It accepts -* only hash values which are less or equal than the maximum key -* length. The implementation comes from InSiTo -*/ -class BOTAN_DLL EMSA1_BSI final : public EMSA1 - { - public: - /** - * @param hash the hash object to use - */ - explicit EMSA1_BSI(HashFunction* hash) : EMSA1(hash) {} - private: - secure_vector<byte> encoding_of(const secure_vector<byte>&, size_t, - RandomNumberGenerator& rng) override; - }; - -} - -#endif diff --git a/src/lib/pk_pad/emsa1_bsi/info.txt b/src/lib/pk_pad/emsa1_bsi/info.txt deleted file mode 100644 index 021c99720..000000000 --- a/src/lib/pk_pad/emsa1_bsi/info.txt +++ /dev/null @@ -1,5 +0,0 @@ -define EMSA1_BSI 20131128 - -<requires> -emsa1 -</requires> |