diff options
| author | lloyd <[email protected]> | 2014-01-10 23:07:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-01-10 23:07:16 +0000 |
| commit | ad6555f522ae16f6284e8dafa02f630b88bcf289 (patch) | |
| tree | bd63c51dbeab75eb0f90c72589bc922141237056 /src/lib/pk_pad | |
| parent | 6894dca64c04936d07048c0e8cbf7e25858548c3 (diff) | |
Split up docs into the reference manual, the website, and everything else.
Add `website` target to makefile.
Some progress towards fixing minimized builds.
TLS now hard requires ECDSA and GCM since otherwise a minimized build
has only insecure options.
Remove boost_thread dependency in command line tool
Diffstat (limited to 'src/lib/pk_pad')
| -rw-r--r-- | src/lib/pk_pad/get_pk_pad.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/pk_pad/get_pk_pad.cpp b/src/lib/pk_pad/get_pk_pad.cpp index 8c27b1fa1..2809f1714 100644 --- a/src/lib/pk_pad/get_pk_pad.cpp +++ b/src/lib/pk_pad/get_pk_pad.cpp @@ -112,8 +112,6 @@ EME* get_eme(const std::string& algo_spec) { SCAN_Name request(algo_spec); - Algorithm_Factory& af = global_state().algorithm_factory(); - if(request.algo_name() == "Raw") return nullptr; // No padding @@ -123,6 +121,8 @@ EME* get_eme(const std::string& algo_spec) #endif #if defined(BOTAN_HAS_EME1) + Algorithm_Factory& af = global_state().algorithm_factory(); + if(request.algo_name() == "EME1" && request.arg_count_between(1, 2)) { if(request.arg_count() == 1 || |