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 | |
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')
-rw-r--r-- | src/lib/cert/x509/info.txt | 1 | ||||
-rw-r--r-- | src/lib/engine/core_engine/core_modes.cpp | 5 | ||||
-rw-r--r-- | src/lib/pk_pad/get_pk_pad.cpp | 4 | ||||
-rw-r--r-- | src/lib/rng/info.txt | 2 | ||||
-rw-r--r-- | src/lib/tls/info.txt | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/cert/x509/info.txt b/src/lib/cert/x509/info.txt index 83512857f..a74fd6631 100644 --- a/src/lib/cert/x509/info.txt +++ b/src/lib/cert/x509/info.txt @@ -3,6 +3,7 @@ define OCSP 20131128 <requires> datastor +http_util </requires> <libs> diff --git a/src/lib/engine/core_engine/core_modes.cpp b/src/lib/engine/core_engine/core_modes.cpp index 6524d9c16..fa8c9babf 100644 --- a/src/lib/engine/core_engine/core_modes.cpp +++ b/src/lib/engine/core_engine/core_modes.cpp @@ -10,6 +10,7 @@ #include <botan/filters.h> #include <botan/algo_factory.h> #include <botan/mode_pad.h> +#include <botan/transform_filter.h> #include <memory> #if defined(BOTAN_HAS_MODE_CFB) @@ -170,11 +171,11 @@ Keyed_Filter* get_cipher_mode(const BlockCipher* block_cipher, } #endif -#if defined(BOTAN_HAS_AEAD_FILTER) - if(bits % 8 != 0) throw std::invalid_argument("AEAD interface does not support non-octet length tags"); +#if defined(BOTAN_HAS_AEAD_FILTER) + const size_t tag_size = bits / 8; #if defined(BOTAN_HAS_AEAD_CCM) 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 || diff --git a/src/lib/rng/info.txt b/src/lib/rng/info.txt index 4c88ba382..ba7aa8e6a 100644 --- a/src/lib/rng/info.txt +++ b/src/lib/rng/info.txt @@ -1,3 +1,5 @@ <requires> entropy +auto_rng +hmac_rng </requires> diff --git a/src/lib/tls/info.txt b/src/lib/tls/info.txt index adae12cb2..5a5601df5 100644 --- a/src/lib/tls/info.txt +++ b/src/lib/tls/info.txt @@ -73,8 +73,10 @@ credentials cryptobox_psk dh ecdh +ecdsa eme_pkcs emsa3 +gcm hmac kdf2 md5 |