Improved md5() implementation (Solar Designer)

Author: dstogov

NEWS

@@ -102,6 +102,7 @@ PHP                                                                        NEWS
   . Added support for OpenSSL digest functions
   . Added support for OpenSSL cipher functions
   . Added access to internal values of DSA, RSA and DH keys
+- Imoroved md5() implementation (Solar Designer, Dmitry)
 
 - Fixed html_entity_decode() incorrectly converting numeric html entities
   to different characters with cp1251 and cp866. (Scott)

ext/hash/hash_md.c

@@ -442,8 +442,8 @@ const unsigned char block[64];
 
 /* MD4 */
 
-#define MD4_F(x,y,z)			(((x) & (y)) | ((~(x)) & (z)))
-#define MD4_G(x,y,z)			(((x) & (y)) | ((x) & (z)) | ((y) & (z)))
+#define MD4_F(x,y,z)			((z) ^ ((x) & ((y) ^ (z))))
+#define MD4_G(x,y,z)			(((x) & ((y) | (z))) | ((y) & (z)))
 #define MD4_H(x,y,z)			((x) ^ (y) ^ (z))
 
 #define ROTL32(s,v)				(((v) << (s)) | ((v) >> (32 - (s))))
@@ -518,8 +518,23 @@ static void MD4Transform(php_hash_uint32 state[4], const unsigned char block[64]
 	state[3] += d;
 }
 
+/* {{{ PHP_MD4Init
+ * MD4 initialization. Begins an MD4 operation, writing a new context.
+ */
+PHP_HASH_API void PHP_MD4Init(PHP_MD4_CTX * context)
+{
+	context->count[0] = context->count[1] = 0;
+	/* Load magic initialization constants.
+	 */
+	context->state[0] = 0x67452301;
+	context->state[1] = 0xefcdab89;
+	context->state[2] = 0x98badcfe;
+	context->state[3] = 0x10325476;
+}
+/* }}} */
+
 /* {{{ PHP_MD4Update
-   MD4 block update operation. Continues an MD5 message-digest
+   MD4 block update operation. Continues an MD4 message-digest
    operation, processing another message block, and updating the
    context.
  */

ext/hash/php_hash_md.h

@@ -81,7 +81,7 @@ typedef struct {
 	unsigned char buffer[64];
 } PHP_MD4_CTX;
 
-#define PHP_MD4Init			PHP_MD5Init
+PHP_HASH_API void PHP_MD4Init(PHP_MD4_CTX *);
 PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX *context, const unsigned char *, unsigned int);
 PHP_HASH_API void PHP_MD4Final(unsigned char[16], PHP_MD4_CTX *);