diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-05-14 16:02:59 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-05-14 16:02:59 -0500 |
| commit | 1607419e3817d12a8fed307d1e0f8fead5bbda69 (patch) | |
| tree | 7204ee5a2ccb2aa96a4cc1dbca7d43ad6dd2147c /src | |
| parent | Merge pull request #5532 (diff) | |
| parent | wallet: fix certificate fingerprint length check (diff) | |
| download | monero-1607419e3817d12a8fed307d1e0f8fead5bbda69.tar.xz | |
Merge pull request #5538
615f287 wallet: fix certificate fingerprint length check (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 4a4abd872..47a278ceb 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -344,7 +344,7 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl { std::vector<std::vector<uint8_t>> ssl_allowed_fingerprints{ daemon_ssl_allowed_fingerprints.size() }; std::transform(daemon_ssl_allowed_fingerprints.begin(), daemon_ssl_allowed_fingerprints.end(), ssl_allowed_fingerprints.begin(), epee::from_hex::vector); - for (const auto &fpr: daemon_ssl_allowed_fingerprints) + for (const auto &fpr: ssl_allowed_fingerprints) { THROW_WALLET_EXCEPTION_IF(fpr.size() != SSL_FINGERPRINT_SIZE, tools::error::wallet_internal_error, "SHA-256 fingerprint should be " BOOST_PP_STRINGIZE(SSL_FINGERPRINT_SIZE) " bytes long."); diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 3e2899962..16a2b3808 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -255,7 +255,7 @@ namespace tools { std::vector<std::vector<uint8_t>> allowed_fingerprints{ rpc_ssl_allowed_fingerprints.size() }; std::transform(rpc_ssl_allowed_fingerprints.begin(), rpc_ssl_allowed_fingerprints.end(), allowed_fingerprints.begin(), epee::from_hex::vector); - for (const auto &fpr: rpc_ssl_allowed_fingerprints) + for (const auto &fpr: allowed_fingerprints) { if (fpr.size() != SSL_FINGERPRINT_SIZE) { |