highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-09 03:02:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of boost::trim use with locale-independent TrimString

Browse Source
This commit is contained in:
Ben Woosley
2020-02-12 12:28:26 -05:00
committed by fanquake
parent 77e77e8544
commit 93551862a1
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/httprpc.cpp
View File

@@ -10,6 +10,7 @@
#include <rpc/protocol.h> #include <rpc/protocol.h>
#include <rpc/server.h> #include <rpc/server.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/string.h>
#include <util/system.h> #include <util/system.h>
#include <util/translation.h> #include <util/translation.h>
#include <walletinitinterface.h> #include <walletinitinterface.h>
@@ -22,7 +23,7 @@
#include <set> #include <set>
#include <string> #include <string>
#include <boost/algorithm/string.hpp> // boost::trim #include <boost/algorithm/string.hpp>
/** WWW-Authenticate to present with 401 Unauthorized response */ /** WWW-Authenticate to present with 401 Unauthorized response */
static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\""; static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
@@ -130,8 +131,7 @@ static bool RPCAuthorized(const std::string& strAuth, std::string& strAuthUserna
return false; return false;
if (strAuth.substr(0, 6) != "Basic ") if (strAuth.substr(0, 6) != "Basic ")
return false; return false;
std::string strUserPass64 = strAuth.substr(6); std::string strUserPass64 = TrimString(strAuth.substr(6));
boost::trim(strUserPass64);
std::string strUserPass = DecodeBase64(strUserPass64); std::string strUserPass = DecodeBase64(strUserPass64);
if (strUserPass.find(':') != std::string::npos) if (strUserPass.find(':') != std::string::npos)

1
test/lint/lint-locale-dependence.sh
View File

@@ -42,7 +42,6 @@ KNOWN_VIOLATIONS=(
"src/bitcoin-tx.cpp.*trim_right" "src/bitcoin-tx.cpp.*trim_right"
"src/dbwrapper.cpp.*stoul" "src/dbwrapper.cpp.*stoul"
"src/dbwrapper.cpp:.*vsnprintf" "src/dbwrapper.cpp:.*vsnprintf"
"src/httprpc.cpp.*trim"
"src/node/blockstorage.cpp:.*atoi" "src/node/blockstorage.cpp:.*atoi"
"src/qt/rpcconsole.cpp:.*atoi" "src/qt/rpcconsole.cpp:.*atoi"
"src/rest.cpp:.*strtol" "src/rest.cpp:.*strtol"