# # # patch "mtn_cvs/botan/md5.cpp" # from [70854c883cc5e7c89045e021834fe6f9e6da393a] # to [019efeb7b2df189c4d01a61beb726e1efffe6af7] # # patch "mtn_cvs/botan/md5.h" # from [3a00e74b59cd9681f792fcbf46d4f29f96c398bb] # to [205c2a340e09f1a2100cbe97a4a0c2d24eded1b9] # ============================================================ --- mtn_cvs/botan/md5.cpp 70854c883cc5e7c89045e021834fe6f9e6da393a +++ mtn_cvs/botan/md5.cpp 019efeb7b2df189c4d01a61beb726e1efffe6af7 @@ -1,9 +1,10 @@ /************************************************* * MD5 Source File * -* (C) 1999-2005 The Botan Project * +* (C) 1999-2007 The Botan Project * *************************************************/ #include +#include #include namespace Botan { @@ -57,8 +58,8 @@ void MD5::hash(const byte input[]) *************************************************/ void MD5::hash(const byte input[]) { - for(u32bit j = 0; j != 16; j++) - M[j] = make_u32bit(input[4*j+3], input[4*j+2], input[4*j+1], input[4*j]); + for(u32bit j = 0; j != 16; ++j) + M[j] = load_le(input, j); u32bit A = digest[0], B = digest[1], C = digest[2], D = digest[3]; @@ -106,8 +107,8 @@ void MD5::copy_out(byte output[]) *************************************************/ void MD5::copy_out(byte output[]) { - for(u32bit j = 0; j != OUTPUT_LENGTH; j++) - output[j] = get_byte(3 - (j % 4), digest[j/4]); + for(u32bit j = 0; j != OUTPUT_LENGTH; j += 4) + store_le(digest[j/4], output + j); } /************************************************* ============================================================ --- mtn_cvs/botan/md5.h 3a00e74b59cd9681f792fcbf46d4f29f96c398bb +++ mtn_cvs/botan/md5.h 205c2a340e09f1a2100cbe97a4a0c2d24eded1b9 @@ -1,6 +1,6 @@ /************************************************* * MD5 Header File * -* (C) 1999-2005 The Botan Project * +* (C) 1999-2007 The Botan Project * *************************************************/ #ifndef BOTAN_MD5_H__