diff options
| author | lloyd <[email protected]> | 2015-02-03 08:11:45 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-02-03 08:11:45 +0000 |
| commit | f9a7c85b74be0f4a7273e8e0591703af83036e81 (patch) | |
| tree | 075dbe119fc16863cad99b432ca6251778bd8fd1 /src/lib/tls | |
| parent | 69d2cd919c698a6b138b2ccba0de5d5aa2a33a03 (diff) | |
Convert PK operations to using Algo_Registry instead of Engine.
Remove global PRNG.
Diffstat (limited to 'src/lib/tls')
| -rw-r--r-- | src/lib/tls/msg_cert_verify.cpp | 2 | ||||
| -rw-r--r-- | src/lib/tls/msg_server_kex.cpp | 2 | ||||
| -rw-r--r-- | src/lib/tls/tls_handshake_state.cpp | 3 | ||||
| -rw-r--r-- | src/lib/tls/tls_handshake_state.h | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/tls/msg_cert_verify.cpp b/src/lib/tls/msg_cert_verify.cpp index 3837e3871..74565e29b 100644 --- a/src/lib/tls/msg_cert_verify.cpp +++ b/src/lib/tls/msg_cert_verify.cpp @@ -82,7 +82,7 @@ bool Certificate_Verify::verify(const X509_Certificate& cert, std::unique_ptr<Public_Key> key(cert.subject_public_key()); std::pair<std::string, Signature_Format> format = - state.understand_sig_format(*key.get(), m_hash_algo, m_sig_algo, true); + state.understand_sig_format(*key.get(), m_hash_algo, m_sig_algo); PK_Verifier verifier(*key, format.first, format.second); diff --git a/src/lib/tls/msg_server_kex.cpp b/src/lib/tls/msg_server_kex.cpp index 2950f1906..3fcdb5ab2 100644 --- a/src/lib/tls/msg_server_kex.cpp +++ b/src/lib/tls/msg_server_kex.cpp @@ -256,7 +256,7 @@ bool Server_Key_Exchange::verify(const Public_Key& server_key, const Handshake_State& state) const { std::pair<std::string, Signature_Format> format = - state.understand_sig_format(server_key, m_hash_algo, m_sig_algo, false); + state.understand_sig_format(server_key, m_hash_algo, m_sig_algo); PK_Verifier verifier(server_key, format.first, format.second); diff --git a/src/lib/tls/tls_handshake_state.cpp b/src/lib/tls/tls_handshake_state.cpp index 64d35fd6b..883527810 100644 --- a/src/lib/tls/tls_handshake_state.cpp +++ b/src/lib/tls/tls_handshake_state.cpp @@ -367,8 +367,7 @@ Handshake_State::choose_sig_format(const Private_Key& key, std::pair<std::string, Signature_Format> Handshake_State::understand_sig_format(const Public_Key& key, std::string hash_algo, - std::string sig_algo, - bool for_client_auth) const + std::string sig_algo) const { const std::string algo_name = key.algo_name(); diff --git a/src/lib/tls/tls_handshake_state.h b/src/lib/tls/tls_handshake_state.h index bb2abc209..3ad44c613 100644 --- a/src/lib/tls/tls_handshake_state.h +++ b/src/lib/tls/tls_handshake_state.h @@ -83,8 +83,7 @@ class Handshake_State std::pair<std::string, Signature_Format> understand_sig_format(const Public_Key& key, std::string hash_algo, - std::string sig_algo, - bool for_client_auth) const; + std::string sig_algo) const; std::pair<std::string, Signature_Format> choose_sig_format(const Private_Key& key, |