add HexToBinary, move to RageUtil

This commit is contained in:
Chris Danford
2006-06-25 04:21:58 +00:00
parent db86dbb519
commit 304d4c33ae
3 changed files with 32 additions and 11 deletions
-11
View File
@@ -221,17 +221,6 @@ bool CryptManager::Verify( RString sPath, RString sSignature )
}
#endif
static RString BinaryToHex( const unsigned char *string, int iNumBytes )
{
RString s;
for( int i=0; i<iNumBytes; i++ )
{
unsigned val = string[i];
s += ssprintf( "%x", val );
}
return s;
}
RString CryptManager::GetMD5ForFile( RString fn )
{
struct MD5Context md5c;
+30
View File
@@ -113,6 +113,36 @@ bool IsHexVal( const RString &s )
return true;
}
RString BinaryToHex( const unsigned char *string, int iNumBytes )
{
RString s;
for( int i=0; i<iNumBytes; i++ )
{
unsigned val = string[i];
s += ssprintf( "%x", val );
}
return s;
}
bool HexToBinary( const RString &s, unsigned char *stringOut )
{
if( !IsHexVal(s) )
return false;
for( int i=0; true; i++ )
{
if( (int)s.size() <= i*2 )
break;
RString sByte = s.substr( i*2, 2 );
uint8_t val = 0;
if( sscanf( sByte, "%hx", &val ) != 1 )
return false;
stringOut[i] = val;
}
return true;
}
float HHMMSSToSeconds( const RString &sHHMMSS )
{
vector<RString> arrayBits;
+2
View File
@@ -241,6 +241,8 @@ float fmodfp( float x, float y );
int power_of_two( int input );
bool IsAnInt( const RString &s );
bool IsHexVal( const RString &s );
RString BinaryToHex( const unsigned char *string, int iNumBytes );
bool HexToBinary( const RString &s, unsigned char *stringOut );
float HHMMSSToSeconds( const RString &sHMS );
RString SecondsToHHMMSS( float fSecs );
RString SecondsToMSSMsMs( float fSecs );