Add strUnHex and DH support to utils.

This commit is contained in:
Arthur Britto
2012-04-29 16:48:00 -07:00
parent cf5757378f
commit 2d9eff0ecf
2 changed files with 74 additions and 0 deletions

View File

@@ -24,4 +24,68 @@ char charHex(int iDigit)
return iDigit < 10 ? '0' + iDigit : 'A' - 10 + iDigit;
}
int charUnHex(char cDigit)
{
return cDigit >= '0' && cDigit <= '9'
? cDigit - '0'
: cDigit >= 'A' && cDigit <= 'F'
? cDigit - 'A' + 10
: cDigit >= 'a' && cDigit <= 'f'
? cDigit - 'a' + 10
: -1;
}
void strUnHex(std::string& strDst, const std::string& strSrc)
{
int iBytes = strSrc.size()/2;
strDst.resize(iBytes);
for (int i=0; i != iBytes; i++)
strDst[i] = (charUnHex(strSrc[i*2]) << 4) | charUnHex(strSrc[i*2+1]);
}
void DH_der_gen(std::string& strDer, int iKeyLength)
{
DH* dh = 0;
int iCodes;
do {
dh = DH_generate_parameters(iKeyLength, DH_GENERATOR_5, NULL, NULL);
iCodes = 0;
DH_check(dh, &iCodes);
} while (iCodes & (DH_CHECK_P_NOT_PRIME|DH_CHECK_P_NOT_SAFE_PRIME|DH_UNABLE_TO_CHECK_GENERATOR|DH_NOT_SUITABLE_GENERATOR));
strDer.resize(i2d_DHparams(dh, NULL));
unsigned char* next = reinterpret_cast<unsigned char *>(&strDer[0]);
(void) i2d_DHparams(dh, &next);
}
void DH_der_gen_hex(std::string& strDer, int iKeyLength)
{
std::string strBuf;
DH_der_gen(strBuf, iKeyLength);
strHex(strDer, strBuf);
}
DH* DH_der_load(const std::string& strDer)
{
const unsigned char *pbuf = reinterpret_cast<const unsigned char *>(&strDer[0]);
return d2i_DHparams(NULL, &pbuf, strDer.size());
}
DH* DH_der_load_hex(const std::string& strDer)
{
std::string strBuf;
strUnHex(strBuf, strDer);
return DH_der_load(strBuf);
}
// vim:ts=4

View File

@@ -4,6 +4,8 @@
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/format.hpp>
#include <openssl/dh.h>
#define nothing() do {} while (0)
boost::posix_time::ptime ptEpoch();
@@ -46,6 +48,14 @@ inline void strHex(std::string& strDst, const std::vector<unsigned char> vchData
strHex(strDst, vchData.begin(), vchData.size());
}
int charUnHex(char cDigit);
void strUnHex(std::string& strDst, const std::string& strSrc);
DH* DH_der_load(const std::string& strDer);
DH* DH_der_load_hex(const std::string& strDer);
void DH_der_gen(std::string& strDer, int iKeyLength);
void DH_der_gen_hex(std::string& strDer, int iKeyLength);
#endif
// vim:ts=4