diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 12:55:02 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 12:55:02 -0500 |
| commit | cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423 (patch) | |
| tree | 932e460664a6329d5b9906506d1d6951378768a2 /src/rpc/rpc_args.cpp | |
| parent | 44547006bfcac4f807d28016d597b7e5d3693dfd (diff) | |
| parent | 3387f0e327cb817c5f7f7f4c3d5dcc4990747cd1 (diff) | |
| download | monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.tar.gz monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.tar.xz monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.zip | |
Merge pull request #6351
81c5943 Remove temporary std::string creation in some hex->bin calls (vtnerd)
5fcc23a Move hex->bin conversion to monero copyright files and with less includes (vtnerd)
3387f0e Reduce template bloat in hex->bin for ZMQ json (vtnerd)
Diffstat (limited to 'src/rpc/rpc_args.cpp')
| -rw-r--r-- | src/rpc/rpc_args.cpp | 4 |
1 files changed, 2 insertions, 2 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) |