diff options
| author | Lee Clagett <code@leeclagett.com> | 2019-05-21 15:43:27 -0400 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2019-05-21 16:17:13 +0000 |
| commit | ce73cc3add69ad0f56b47e9693be2ad0080633dc (patch) | |
| tree | dd85d912494e2b19cf5b4d751a60a265896412d1 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #5548 (diff) | |
| download | monero-ce73cc3add69ad0f56b47e9693be2ad0080633dc.tar.xz | |
Fix configuration bug; wallet2 --daemon-ssl-allow-any-cert now works.
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index c87947e39..8f3f30da1 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -399,8 +399,11 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl { const boost::string_ref real_daemon = boost::string_ref{daemon_address}.substr(0, daemon_address.rfind(':')); + /* If SSL or proxy is enabled, then a specific cert, CA or fingerprint must + be specified. This is specific to the wallet. */ const bool verification_required = - ssl_options.support == epee::net_utils::ssl_support_t::e_ssl_support_enabled || use_proxy; + ssl_options.verification != epee::net_utils::ssl_verification_t::none && + (ssl_options.support == epee::net_utils::ssl_support_t::e_ssl_support_enabled || use_proxy); THROW_WALLET_EXCEPTION_IF( verification_required && !ssl_options.has_strong_verification(real_daemon), |