diff options
| author | Lee Clagett <code@leeclagett.com> | 2019-11-17 04:29:18 +0000 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2020-03-09 05:23:59 +0000 |
| commit | 5fcc23ae0a08e6846a4d0fbfdb51627559929068 (patch) | |
| tree | c2ab745028c3d5ce9c3e404392132400dcf2acf3 /src | |
| parent | Remove temporary std::string creation in some hex->bin calls (diff) | |
| download | monero-5fcc23ae0a08e6846a4d0fbfdb51627559929068.tar.xz | |
Move hex->bin conversion to monero copyright files and with less includes
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/rpc_args.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/rpc_args.cpp b/src/rpc/rpc_args.cpp index dcb804d3e..9153e76ea 100644 --- a/src/rpc/rpc_args.cpp +++ b/src/rpc/rpc_args.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019, The Monero Project +// Copyright (c) 2014-2020, The Monero Project // // All rights reserved. // @@ -51,7 +51,7 @@ namespace cryptonote const std::vector<std::string> ssl_allowed_fingerprints = command_line::get_arg(vm, arg.rpc_ssl_allowed_fingerprints); std::vector<std::vector<uint8_t>> allowed_fingerprints{ ssl_allowed_fingerprints.size() }; - std::transform(ssl_allowed_fingerprints.begin(), ssl_allowed_fingerprints.end(), allowed_fingerprints.begin(), epee::from_hex::vector); + std::transform(ssl_allowed_fingerprints.begin(), ssl_allowed_fingerprints.end(), allowed_fingerprints.begin(), epee::from_hex_locale::to_vector); for (const auto &fpr: allowed_fingerprints) { if (fpr.size() != SSL_FINGERPRINT_SIZE) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 7ee32a436..6008dc210 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -357,7 +357,7 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl else if (!daemon_ssl_ca_file.empty() || !daemon_ssl_allowed_fingerprints.empty()) { 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); + std::transform(daemon_ssl_allowed_fingerprints.begin(), daemon_ssl_allowed_fingerprints.end(), ssl_allowed_fingerprints.begin(), epee::from_hex_locale::to_vector); for (const auto &fpr: ssl_allowed_fingerprints) { THROW_WALLET_EXCEPTION_IF(fpr.size() != SSL_FINGERPRINT_SIZE, tools::error::wallet_internal_error, |