livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed md5 buffer not being correctly zero-initialized and refactored code. (#2507)

master
TJ 2024-09-05 23:55:02 +10:00 committed by GitHub
parent 61627f6524
commit bacf9cfeab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 280 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

367
indra/llcommon/llmd5.cpp
View File

@ -68,10 +68,6 @@ documentation and/or software.
*/ */
#include "linden_common.h" #include "linden_common.h"
#include "llmd5.h" #include "llmd5.h"
@ -81,27 +77,22 @@ documentation and/or software.
// how many bytes to grab at a time when checking files // how many bytes to grab at a time when checking files
const int LLMD5::BLOCK_LEN = 4096; const int LLMD5::BLOCK_LEN = 4096;
// LLMD5 simple initialization method // LLMD5 simple initialization method
LLMD5::LLMD5() LLMD5::LLMD5()
{ {
init(); init();
} }
// MD5 block update operation. Continues an MD5 message-digest // MD5 block update operation. Continues an MD5 message-digest
// operation, processing another message block, and updating the // operation, processing another message block, and updating the
// context. // context.
void LLMD5::update(const uint8_t* input, const size_t input_length)
void LLMD5::update (const uint8_t *input, const size_t input_length) { {
size_t input_index, buffer_index; size_t input_index, buffer_index;
size_t buffer_space; // how much space is left in buffer size_t buffer_space; // how much space is left in buffer
if (finalized){ // so we can't update! if (finalized)
{ // so we can't update!
std::cerr << "LLMD5::update: Can't update a finalized digest!" << std::endl; std::cerr << "LLMD5::update: Can't update a finalized digest!" << std::endl;
return; return;
} }
@ -115,198 +106,174 @@ void LLMD5::update (const uint8_t *input, const size_t input_length) {
buffer_space = 64 - buffer_index; // how much space is left in buffer buffer_space = 64 - buffer_index; // how much space is left in buffer
// now, transform each 64-byte piece of the input, bypassing the buffer // now, transform each 64-byte piece of the input, bypassing the buffer
if (input == NULL || input_length == 0){ if (input == NULL || input_length == 0)
{
std::cerr << "LLMD5::update: Invalid input!" << std::endl; std::cerr << "LLMD5::update: Invalid input!" << std::endl;
return; return;
} }
// Transform as many times as possible. // Transform as many times as possible.
if (input_length >= buffer_space) { // ie. we have enough to fill the buffer if (input_length >= buffer_space) // ie. we have enough to fill the buffer
{
// fill the rest of the buffer and transform // fill the rest of the buffer and transform
memcpy( /* Flawfinder: ignore */ memcpy(/* Flawfinder: ignore */
buffer + buffer_index, buffer + buffer_index,
input, input,
buffer_space); buffer_space);
transform (buffer); transform(buffer);
for (input_index = buffer_space; input_index + 63 < input_length; for (input_index = buffer_space; input_index + 63 < input_length; input_index += 64)
input_index += 64) transform(input + input_index);
transform (input+input_index);
buffer_index = 0; // so we can buffer remaining buffer_index = 0; // so we can buffer remaining
} }
else else
input_index=0; // so we can buffer the whole input input_index = 0; // so we can buffer the whole input
// and here we do the buffering: // and here we do the buffering:
memcpy(buffer+buffer_index, input+input_index, input_length-input_index); /* Flawfinder: ignore */ memcpy(buffer + buffer_index, input + input_index, input_length - input_index); /* Flawfinder: ignore */
} }
// MD5 update for files. // MD5 update for files.
// Like above, except that it works on files (and uses above as a primitive.) // Like above, except that it works on files (and uses above as a primitive.)
void LLMD5::update(FILE* file)
void LLMD5::update(FILE* file){ {
unsigned char buffer[BLOCK_LEN]; /* Flawfinder: ignore */ unsigned char buffer[BLOCK_LEN]; /* Flawfinder: ignore */
int len; int len;
while ( (len=(int)fread(buffer, 1, BLOCK_LEN, file)) ) while ((len = (int)fread(buffer, 1, BLOCK_LEN, file)))
update(buffer, len); update(buffer, len);
fclose (file); fclose(file);
} }
// MD5 update for istreams. // MD5 update for istreams.
// Like update for files; see above. // Like update for files; see above.
void LLMD5::update(std::istream& stream)
void LLMD5::update(std::istream& stream){ {
unsigned char buffer[BLOCK_LEN]; /* Flawfinder: ignore */ unsigned char buffer[BLOCK_LEN]; /* Flawfinder: ignore */
int len; int len;
while (stream.good()){ while (stream.good())
stream.read( (char*)buffer, BLOCK_LEN); /* Flawfinder: ignore */ // note that return value of read is unusable. {
len=(int)stream.gcount(); stream.read((char*)buffer, BLOCK_LEN); /* Flawfinder: ignore */ // note that return value of read is unusable.
len = (int)stream.gcount();
update(buffer, len); update(buffer, len);
} }
} }
void LLMD5::update(const std::string& s) void LLMD5::update(const std::string& s)
{ {
update((unsigned char *)s.c_str(),s.length()); update((unsigned char*)s.c_str(), s.length());
} }
// MD5 finalization. Ends an MD5 message-digest operation, writing the // MD5 finalization. Ends an MD5 message-digest operation, writing the
// the message digest and zeroizing the context. // the message digest and zeroizing the context.
void LLMD5::finalize()
{
void LLMD5::finalize (){
unsigned char bits[8]; /* Flawfinder: ignore */ unsigned char bits[8]; /* Flawfinder: ignore */
size_t index, padLen; size_t index, padLen;
static uint8_t PADDING[64]={ static uint8_t PADDING[64] =
{
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}; };
if (finalized){ if (finalized)
{
std::cerr << "LLMD5::finalize: Already finalized this digest!" << std::endl; std::cerr << "LLMD5::finalize: Already finalized this digest!" << std::endl;
return; return;
} }
// Save number of bits. // Save number of bits.
// Treat count, a uint64_t, as uint32_t[2]. // Treat count, a uint64_t, as uint32_t[2].
encode (bits, reinterpret_cast<uint32_t*>(&count), 8); encode(bits, reinterpret_cast<uint32_t*>(&count), 8);
// Pad out to 56 mod 64. // Pad out to 56 mod 64.
index = size_t((count >> 3) & 0x3f); index = size_t((count >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index); padLen = (index < 56) ? (56 - index) : (120 - index);
update (PADDING, padLen); update(PADDING, padLen);
// Append length (before padding) // Append length (before padding)
update (bits, 8); update(bits, 8);
// Store state in digest // Store state in digest
encode (digest, state, 16); encode(digest, state, 16);
// Zeroize sensitive information // Zeroize sensitive information
memset (buffer, 0, sizeof(*buffer)); memset(buffer, 0, sizeof(buffer));
finalized=1;
finalized = true;
} }
LLMD5::LLMD5(FILE* file)
{
LLMD5::LLMD5(FILE *file){
init(); // must be called be all constructors init(); // must be called be all constructors
update(file); update(file);
finalize (); finalize();
} }
LLMD5::LLMD5(std::istream& stream)
{
LLMD5::LLMD5(std::istream& stream){
init(); // must called by all constructors init(); // must called by all constructors
update (stream); update(stream);
finalize(); finalize();
} }
// Digest a string of the format ("%s:%i" % (s, number)) // Digest a string of the format ("%s:%i" % (s, number))
LLMD5::LLMD5(const unsigned char *string, const unsigned int number) LLMD5::LLMD5(const unsigned char* string, const unsigned int number)
{ {
const char *colon = ":"; const char* colon = ":";
char tbuf[16]; /* Flawfinder: ignore */ char tbuf[16]; /* Flawfinder: ignore */
init(); init();
update(string, (U32)strlen((const char *) string)); /* Flawfinder: ignore */ update(string, (U32)strlen((const char*)string)); /* Flawfinder: ignore */
update((const unsigned char *) colon, (U32)strlen(colon)); /* Flawfinder: ignore */ update((const unsigned char*)colon, (U32)strlen(colon)); /* Flawfinder: ignore */
snprintf(tbuf, sizeof(tbuf), "%i", number); /* Flawfinder: ignore */ snprintf(tbuf, sizeof(tbuf), "%i", number); /* Flawfinder: ignore */
update((const unsigned char *) tbuf, (U32)strlen(tbuf)); /* Flawfinder: ignore */ update((const unsigned char*)tbuf, (U32)strlen(tbuf)); /* Flawfinder: ignore */
finalize(); finalize();
} }
// Digest a string // Digest a string
LLMD5::LLMD5(const unsigned char *s) LLMD5::LLMD5(const unsigned char* s)
{ {
init(); init();
update(s, (U32)strlen((const char *) s)); /* Flawfinder: ignore */ update(s, (U32)strlen((const char*)s)); /* Flawfinder: ignore */
finalize(); finalize();
} }
void LLMD5::raw_digest(unsigned char *s) const void LLMD5::raw_digest(unsigned char* s) const
{ {
if (!finalized) if (!finalized)
{ {
std::cerr << "LLMD5::raw_digest: Can't get digest if you haven't "<< std::cerr << "LLMD5::raw_digest: Can't get digest if you haven't "
"finalized the digest!" << std::endl; << "finalized the digest!" << std::endl;
s[0] = '\0'; s[0] = '\0';
return; return;
} }
memcpy(s, digest, 16); /* Flawfinder: ignore */ memcpy(s, digest, 16); /* Flawfinder: ignore */
return;
} }
void LLMD5::hex_digest(char* s) const
void LLMD5::hex_digest(char *s) const
{ {
int i;
if (!finalized) if (!finalized)
{ {
std::cerr << "LLMD5::hex_digest: Can't get digest if you haven't "<< std::cerr << "LLMD5::hex_digest: Can't get digest if you haven't "
"finalized the digest!" <<std::endl; << "finalized the digest!" << std::endl;
s[0] = '\0'; s[0] = '\0';
return; return;
} }
for (i=0; i<16; i++) for (int i = 0; i < 16; i++)
{ {
sprintf(s+i*2, "%02x", digest[i]); /* Flawfinder: ignore */ sprintf(s + i * 2, "%02x", digest[i]); /* Flawfinder: ignore */
} }
s[32]='\0'; s[32] = '\0';
return;
} }
std::ostream& operator<<(std::ostream& stream, const LLMD5& context)
std::ostream& operator<<(std::ostream &stream, LLMD5 context)
{ {
char s[33]; /* Flawfinder: ignore */ char s[33]; /* Flawfinder: ignore */
context.hex_digest(s); context.hex_digest(s);
@ -320,7 +287,7 @@ bool operator==(const LLMD5& a, const LLMD5& b)
unsigned char b_guts[16]; unsigned char b_guts[16];
a.raw_digest(a_guts); a.raw_digest(a_guts);
b.raw_digest(b_guts); b.raw_digest(b_guts);
if (memcmp(a_guts,b_guts,16)==0) if (memcmp(a_guts, b_guts, 16) == 0)
return true; return true;
else else
return false; return false;
@ -328,13 +295,13 @@ bool operator==(const LLMD5& a, const LLMD5& b)
bool operator!=(const LLMD5& a, const LLMD5& b) bool operator!=(const LLMD5& a, const LLMD5& b)
{ {
return !(a==b); return !(a == b);
} }
// PRIVATE METHODS: // PRIVATE METHODS:
void LLMD5::init()
void LLMD5::init(){ {
finalized=0; // we just started! finalized = false; // we just started!
// Nothing counted, so count=0 // Nothing counted, so count=0
count = 0; count = 0;
@ -346,12 +313,9 @@ void LLMD5::init(){
state[3] = 0x10325476; state[3] = 0x10325476;
} }
// Constants for MD5Transform routine. // Constants for MD5Transform routine.
// Although we could use C++ style constants, defines are actually better, // Although we could use C++ style constants, defines are actually better,
// since they let us easily evade scope clashes. // since they let us easily evade scope clashes.
#define S11 7 #define S11 7
#define S12 12 #define S12 12
#define S13 17 #define S13 17
@ -381,114 +345,116 @@ void LLMD5::init(){
/* ROTATE_LEFT rotates x left n bits. /* ROTATE_LEFT rotates x left n bits.
*/ */
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
Rotation is separate from addition to prevent recomputation. Rotation is separate from addition to prevent recomputation.
*/ */
#define FF(a, b, c, d, x, s, ac) { \ #define FF(a, b, c, d, x, s, ac) \
(a) += F ((b), (c), (d)) + (x) + (U32)(ac); \ { \
(a) = ROTATE_LEFT ((a), (s)); \ (a) += F((b), (c), (d)) + (x) + (U32)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); \ (a) += (b); \
} }
#define GG(a, b, c, d, x, s, ac) { \ #define GG(a, b, c, d, x, s, ac) \
(a) += G ((b), (c), (d)) + (x) + (U32)(ac); \ { \
(a) = ROTATE_LEFT ((a), (s)); \ (a) += G((b), (c), (d)) + (x) + (U32)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); \ (a) += (b); \
} }
#define HH(a, b, c, d, x, s, ac) { \ #define HH(a, b, c, d, x, s, ac) \
(a) += H ((b), (c), (d)) + (x) + (U32)(ac); \ { \
(a) = ROTATE_LEFT ((a), (s)); \ (a) += H((b), (c), (d)) + (x) + (U32)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); \ (a) += (b); \
} }
#define II(a, b, c, d, x, s, ac) { \ #define II(a, b, c, d, x, s, ac) \
(a) += I ((b), (c), (d)) + (x) + (U32)(ac); \ { \
(a) = ROTATE_LEFT ((a), (s)); \ (a) += I((b), (c), (d)) + (x) + (U32)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); \ (a) += (b); \
} }
// LLMD5 basic transformation. Transforms state based on block. // LLMD5 basic transformation. Transforms state based on block.
void LLMD5::transform (const U8 block[64]){ void LLMD5::transform(const U8 block[64])
{
uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16]; uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
decode (x, block, 64); decode(x, block, 64);
assert(!finalized); // not just a user error, since the method is private assert(!finalized); // not just a user error, since the method is private
/* Round 1 */ /* Round 1 */
FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ FF(a, b, c, d, x[0], S11, 0xd76aa478); /* 1 */
FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ FF(d, a, b, c, x[1], S12, 0xe8c7b756); /* 2 */
FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ FF(c, d, a, b, x[2], S13, 0x242070db); /* 3 */
FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ FF(b, c, d, a, x[3], S14, 0xc1bdceee); /* 4 */
FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ FF(a, b, c, d, x[4], S11, 0xf57c0faf); /* 5 */
FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ FF(d, a, b, c, x[5], S12, 0x4787c62a); /* 6 */
FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ FF(c, d, a, b, x[6], S13, 0xa8304613); /* 7 */
FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ FF(b, c, d, a, x[7], S14, 0xfd469501); /* 8 */
FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ FF(a, b, c, d, x[8], S11, 0x698098d8); /* 9 */
FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ FF(d, a, b, c, x[9], S12, 0x8b44f7af); /* 10 */
FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
/* Round 2 */ /* Round 2 */
GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ GG(a, b, c, d, x[1], S21, 0xf61e2562); /* 17 */
GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ GG(d, a, b, c, x[6], S22, 0xc040b340); /* 18 */
GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ GG(b, c, d, a, x[0], S24, 0xe9b6c7aa); /* 20 */
GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ GG(a, b, c, d, x[5], S21, 0xd62f105d); /* 21 */
GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ GG(d, a, b, c, x[10], S22, 0x2441453); /* 22 */
GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ GG(b, c, d, a, x[4], S24, 0xe7d3fbc8); /* 24 */
GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ GG(a, b, c, d, x[9], S21, 0x21e1cde6); /* 25 */
GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ GG(c, d, a, b, x[3], S23, 0xf4d50d87); /* 27 */
GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ GG(b, c, d, a, x[8], S24, 0x455a14ed); /* 28 */
GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ GG(d, a, b, c, x[2], S22, 0xfcefa3f8); /* 30 */
GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ GG(c, d, a, b, x[7], S23, 0x676f02d9); /* 31 */
GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
/* Round 3 */ /* Round 3 */
HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ HH(a, b, c, d, x[5], S31, 0xfffa3942); /* 33 */
HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ HH(d, a, b, c, x[8], S32, 0x8771f681); /* 34 */
HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ HH(a, b, c, d, x[1], S31, 0xa4beea44); /* 37 */
HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ HH(d, a, b, c, x[4], S32, 0x4bdecfa9); /* 38 */
HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ HH(c, d, a, b, x[7], S33, 0xf6bb4b60); /* 39 */
HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ HH(d, a, b, c, x[0], S32, 0xeaa127fa); /* 42 */
HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ HH(c, d, a, b, x[3], S33, 0xd4ef3085); /* 43 */
HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ HH(b, c, d, a, x[6], S34, 0x4881d05); /* 44 */
HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ HH(a, b, c, d, x[9], S31, 0xd9d4d039); /* 45 */
HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ HH(b, c, d, a, x[2], S34, 0xc4ac5665); /* 48 */
/* Round 4 */ /* Round 4 */
II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ II(a, b, c, d, x[0], S41, 0xf4292244); /* 49 */
II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ II(d, a, b, c, x[7], S42, 0x432aff97); /* 50 */
II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ II(b, c, d, a, x[5], S44, 0xfc93a039); /* 52 */
II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ II(d, a, b, c, x[3], S42, 0x8f0ccc92); /* 54 */
II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ II(b, c, d, a, x[1], S44, 0x85845dd1); /* 56 */
II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ II(a, b, c, d, x[8], S41, 0x6fa87e4f); /* 57 */
II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ II(c, d, a, b, x[6], S43, 0xa3014314); /* 59 */
II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ II(a, b, c, d, x[4], S41, 0xf7537e82); /* 61 */
II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ II(c, d, a, b, x[2], S43, 0x2ad7d2bb); /* 63 */
II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ II(b, c, d, a, x[9], S44, 0xeb86d391); /* 64 */
state[0] += a; state[0] += a;
state[1] += b; state[1] += b;
@ -496,38 +462,27 @@ void LLMD5::transform (const U8 block[64]){
state[3] += d; state[3] += d;
// Zeroize sensitive information. // Zeroize sensitive information.
memset ( (uint8_t *) x, 0, sizeof(x)); memset(x, 0, sizeof(x));
} }
// Encodes input (uint32_t) into output (unsigned char). Assumes len is // Encodes input (uint32_t) into output (unsigned char). Assumes len is
// a multiple of 4. // a multiple of 4.
void LLMD5::encode (uint8_t *output, const uint32_t *input, const size_t len) { void LLMD5::encode(uint8_t* output, const uint32_t* input, const size_t len)
{
size_t i, j; for (size_t i = 0, j = 0; j < len; i++, j += 4)
{
for (i = 0, j = 0; j < len; i++, j += 4) { output[j] = (uint8_t)(input[i] & 0xff);
output[j] = (uint8_t) (input[i] & 0xff); output[j + 1] = (uint8_t)((input[i] >> 8) & 0xff);
output[j+1] = (uint8_t) ((input[i] >> 8) & 0xff); output[j + 2] = (uint8_t)((input[i] >> 16) & 0xff);
output[j+2] = (uint8_t) ((input[i] >> 16) & 0xff); output[j + 3] = (uint8_t)((input[i] >> 24) & 0xff);
output[j+3] = (uint8_t) ((input[i] >> 24) & 0xff);
} }
} }
// Decodes input (unsigned char) into output (uint32_t). Assumes len is // Decodes input (unsigned char) into output (uint32_t). Assumes len is
// a multiple of 4. // a multiple of 4.
void LLMD5::decode (uint32_t *output, const uint8_t *input, const size_t len){ void LLMD5::decode(uint32_t* output, const uint8_t* input, const size_t len)
{
size_t i, j; for (size_t i = 0, j = 0; j < len; i++, j += 4)
for (i = 0, j = 0; j < len; i++, j += 4)
output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) | output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
(((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24); (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
} }

56
indra/llcommon/llmd5.h
View File

@ -76,50 +76,48 @@ const int MD5RAW_BYTES = 16;
const int MD5HEX_STR_SIZE = 33; // char hex[MD5HEX_STR_SIZE]; with null const int MD5HEX_STR_SIZE = 33; // char hex[MD5HEX_STR_SIZE]; with null
const int MD5HEX_STR_BYTES = 32; // message system fixed size const int MD5HEX_STR_BYTES = 32; // message system fixed size
class LL_COMMON_API LLMD5 { class LL_COMMON_API LLMD5
// how many bytes to grab at a time when checking files {
// how many bytes to grab at a time when checking files
static const int BLOCK_LEN; static const int BLOCK_LEN;
public: public:
// methods for controlled operation: // methods for controlled operation:
LLMD5 (); // simple initializer LLMD5(); // simple initializer
void update (const uint8_t *input, const size_t input_length); void update(const uint8_t* input, const size_t input_length);
void update (std::istream& stream); void update(std::istream& stream);
void update (FILE *file); void update(FILE* file);
void update (const std::string& str); void update(const std::string& str);
void finalize (); void finalize();
// constructors for special circumstances. All these constructors finalize // constructors for special circumstances. All these constructors finalize
// the MD5 context. // the MD5 context.
LLMD5 (const unsigned char *string); // digest string, finalize LLMD5(const unsigned char* string); // digest string, finalize
LLMD5 (std::istream& stream); // digest stream, finalize LLMD5(std::istream& stream); // digest stream, finalize
LLMD5 (FILE *file); // digest file, close, finalize LLMD5(FILE* file); // digest file, close, finalize
LLMD5 (const unsigned char *string, const unsigned int number); LLMD5(const unsigned char* string, const unsigned int number);
// methods to acquire finalized result // methods to acquire finalized result
void raw_digest(unsigned char *array) const; // provide 16-byte array for binary data void raw_digest(unsigned char* array) const; // provide 16-byte array for binary data
void hex_digest(char *string) const; // provide 33-byte array for ascii-hex string void hex_digest(char* string) const; // provide 33-byte array for ascii-hex string
friend LL_COMMON_API std::ostream& operator<< (std::ostream&, LLMD5 context); friend LL_COMMON_API std::ostream& operator<<(std::ostream&, const LLMD5& context);
private: private:
// next, the private data:
// next, the private data:
uint32_t state[4]; uint32_t state[4];
uint64_t count; // number of *bits*, mod 2^64 uint64_t count; // number of *bits*, mod 2^64
uint8_t buffer[64]; // input buffer uint8_t buffer[64]; // input buffer
uint8_t digest[16]; uint8_t digest[16];
uint8_t finalized; bool finalized;
// last, the private methods, mostly static: // last, the private methods, mostly static:
void init (); // called by all constructors void init(); // called by all constructors
void transform (const uint8_t *buffer); // does the real update work. Note void transform(const uint8_t* buffer); // does the real update work. Note
// that length is implied to be 64. // that length is implied to be 64.
static void encode (uint8_t *dest, const uint32_t *src, const size_t length); static void encode(uint8_t* dest, const uint32_t* src, const size_t length);
static void decode (uint32_t *dest, const uint8_t *src, const size_t length); static void decode(uint32_t* dest, const uint8_t* src, const size_t length);
}; };
LL_COMMON_API bool operator==(const LLMD5& a, const LLMD5& b); LL_COMMON_API bool operator==(const LLMD5& a, const LLMD5& b);