diff options
| -rw-r--r-- | src/hash/par_hash/par_hash.cpp | 2 | ||||
| -rw-r--r-- | src/ssl/tls_record.h | 2 | ||||
| -rw-r--r-- | src/ssl/tls_server.cpp | 4 | ||||
| -rw-r--r-- | src/ssl/tls_server.h | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/hash/par_hash/par_hash.cpp b/src/hash/par_hash/par_hash.cpp index 6e3357660..a95ba36b9 100644 --- a/src/hash/par_hash/par_hash.cpp +++ b/src/hash/par_hash/par_hash.cpp @@ -28,7 +28,7 @@ void Parallel::final_result(byte out[]) for(auto hash = hashes.begin(); hash != hashes.end(); ++hash) { (*hash)->final(out + offset); - offset += (*hash)->OUTPUT_LENGTH; + offset += (*hash)->output_length(); } } diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h index 40b6a6f8d..b4c052a1c 100644 --- a/src/ssl/tls_record.h +++ b/src/ssl/tls_record.h @@ -16,6 +16,8 @@ #include <vector> #include <functional> +namespace Botan { + using namespace std::placeholders; /** diff --git a/src/ssl/tls_server.cpp b/src/ssl/tls_server.cpp index 4e071da59..20e98797f 100644 --- a/src/ssl/tls_server.cpp +++ b/src/ssl/tls_server.cpp @@ -85,8 +85,8 @@ void server_check_state(Handshake_Type new_msg, Handshake_State* state) /* * TLS Server Constructor */ -TLS_Server::TLS_Server(std::tr1::function<size_t (byte[], size_t)> input_fn, - std::tr1::function<void (const byte[], size_t)> output_fn, +TLS_Server::TLS_Server(std::function<size_t (byte[], size_t)> input_fn, + std::function<void (const byte[], size_t)> output_fn, const TLS_Policy& policy, RandomNumberGenerator& rng, const X509_Certificate& cert, diff --git a/src/ssl/tls_server.h b/src/ssl/tls_server.h index a6b0f9cb4..f8b38dd0b 100644 --- a/src/ssl/tls_server.h +++ b/src/ssl/tls_server.h @@ -36,8 +36,8 @@ class BOTAN_DLL TLS_Server : public TLS_Connection * FIXME: support cert chains (!) * FIXME: support anonymous servers */ - TLS_Server(std::tr1::function<size_t (byte[], size_t)> input_fn, - std::tr1::function<void (const byte[], size_t)> output_fn, + TLS_Server(std::function<size_t (byte[], size_t)> input_fn, + std::function<void (const byte[], size_t)> output_fn, const TLS_Policy& policy, RandomNumberGenerator& rng, const X509_Certificate& cert, @@ -53,7 +53,7 @@ class BOTAN_DLL TLS_Server : public TLS_Connection void process_handshake_msg(Handshake_Type, const MemoryRegion<byte>&); - std::tr1::function<size_t (byte[], size_t)> input_fn; + std::function<size_t (byte[], size_t)> input_fn; const TLS_Policy& policy; RandomNumberGenerator& rng; |