diff options
| -rw-r--r-- | src/tls/tls_handshake_state.cpp | 6 | ||||
| -rw-r--r-- | src/tls/tls_policy.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tls/tls_handshake_state.cpp b/src/tls/tls_handshake_state.cpp index 15017648c..c98b147d9 100644 --- a/src/tls/tls_handshake_state.cpp +++ b/src/tls/tls_handshake_state.cpp @@ -173,7 +173,7 @@ Handshake_State::choose_sig_format(const Private_Key* key, return std::make_pair(padding, IEEE_1363); } - else if(sig_algo == "DSA") + else if(sig_algo == "DSA" || sig_algo == "ECDSA") { const std::string padding = "EMSA1(" + hash_algo + ")"; @@ -227,9 +227,9 @@ Handshake_State::understand_sig_format(const Public_Key* key, const std::string padding = "EMSA3(" + hash_algo + ")"; return std::make_pair(padding, IEEE_1363); } - else if(algo_name == "DSA") + else if(algo_name == "DSA" || algo_name == "ECDSA") { - if(for_client_auth && this->version == Protocol_Version::SSL_V3) + if(algo_name == "DSA" && for_client_auth && this->version == Protocol_Version::SSL_V3) { hash_algo = "Raw"; } diff --git a/src/tls/tls_policy.cpp b/src/tls/tls_policy.cpp index c0ce15641..77b103aa2 100644 --- a/src/tls/tls_policy.cpp +++ b/src/tls/tls_policy.cpp @@ -50,7 +50,7 @@ std::vector<std::string> Policy::allowed_key_exchange_methods() const std::vector<std::string> Policy::allowed_signature_methods() const { std::vector<std::string> allowed; - //allowed.push_back("ECDSA"); + allowed.push_back("ECDSA"); allowed.push_back("RSA"); allowed.push_back("DSA"); return allowed; |