Simplify strHex

This commit is contained in:
Arthur Britto
2012-05-10 15:48:55 -07:00
parent 97820c0cc5
commit 15c940e036
2 changed files with 10 additions and 6 deletions

View File

@@ -69,7 +69,7 @@ void DH_der_gen_hex(std::string& strDer, int iKeyLength)
DH_der_gen(strBuf, iKeyLength); DH_der_gen(strBuf, iKeyLength);
strHex(strDer, strBuf); strDer = strHex(strBuf);
} }
DH* DH_der_load(const std::string& strDer) DH* DH_der_load(const std::string& strDer)

View File

@@ -36,8 +36,10 @@ std::string strJoin(Iterator first, Iterator last, std::string strSeperator)
char charHex(int iDigit); char charHex(int iDigit);
template<class Iterator> template<class Iterator>
void strHex(std::string& strDst, Iterator first, int iSize) std::string strHex(Iterator first, int iSize)
{ {
std::string strDst;
strDst.resize(iSize*2); strDst.resize(iSize*2);
for (int i = 0; i < iSize; i++) { for (int i = 0; i < iSize; i++) {
@@ -46,14 +48,16 @@ void strHex(std::string& strDst, Iterator first, int iSize)
strDst[i*2] = charHex(c >> 4); strDst[i*2] = charHex(c >> 4);
strDst[i*2+1] = charHex(c & 15); strDst[i*2+1] = charHex(c & 15);
} }
return strDst;
} }
inline void strHex(std::string& strDst, const std::string& strSrc) { inline const std::string strHex(const std::string& strSrc) {
strHex(strDst, strSrc.begin(), strSrc.size()); return strHex(strSrc.begin(), strSrc.size());
} }
inline void strHex(std::string& strDst, const std::vector<unsigned char> vchData) { inline std::string strHex(const std::vector<unsigned char> vchData) {
strHex(strDst, vchData.begin(), vchData.size()); return strHex(vchData.begin(), vchData.size());
} }
int charUnHex(char cDigit); int charUnHex(char cDigit);