pollita Fri Dec 2 20:17:49 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/hash/tests md4.phpt
Modified files:
/php-src/ext/hash hash.c php_hash.h hash_md.c php_hash_md.h
package.xml
Log:
MFH: Add MD4
http://cvs.php.net/diff.php/php-src/ext/hash/hash.c?r1=1.18.2.2&r2=1.18.2.3&ty=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.18.2.2 php-src/ext/hash/hash.c:1.18.2.3
--- php-src/ext/hash/hash.c:1.18.2.2 Thu Dec 1 20:59:44 2005
+++ php-src/ext/hash/hash.c Fri Dec 2 20:17:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash.c,v 1.18.2.2 2005/12/02 01:59:44 iliaa Exp $ */
+/* $Id: hash.c,v 1.18.2.3 2005/12/03 01:17:48 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -516,6 +516,7 @@
zend_hash_init(&php_hash_hashtable, 35, NULL, NULL, 1);
+ php_hash_register_algo("md4", &php_hash_md4_ops);
php_hash_register_algo("md5", &php_hash_md5_ops);
php_hash_register_algo("sha1", &php_hash_sha1_ops);
php_hash_register_algo("sha256", &php_hash_sha256_ops);
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash.h?r1=1.13.2.2&r2=1.13.2.3&ty=u
Index: php-src/ext/hash/php_hash.h
diff -u php-src/ext/hash/php_hash.h:1.13.2.2
php-src/ext/hash/php_hash.h:1.13.2.3
--- php-src/ext/hash/php_hash.h:1.13.2.2 Thu Dec 1 20:59:45 2005
+++ php-src/ext/hash/php_hash.h Fri Dec 2 20:17:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_hash.h,v 1.13.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash.h,v 1.13.2.3 2005/12/03 01:17:48 pollita Exp $ */
#ifndef PHP_HASH_H
#define PHP_HASH_H
@@ -52,6 +52,7 @@
unsigned char *key;
} php_hash_data;
+extern php_hash_ops php_hash_md4_ops;
extern php_hash_ops php_hash_md5_ops;
extern php_hash_ops php_hash_sha1_ops;
extern php_hash_ops php_hash_sha256_ops;
http://cvs.php.net/diff.php/php-src/ext/hash/hash_md.c?r1=1.6.2.2&r2=1.6.2.3&ty=u
Index: php-src/ext/hash/hash_md.c
diff -u php-src/ext/hash/hash_md.c:1.6.2.2 php-src/ext/hash/hash_md.c:1.6.2.3
--- php-src/ext/hash/hash_md.c:1.6.2.2 Thu Dec 1 20:59:44 2005
+++ php-src/ext/hash/hash_md.c Fri Dec 2 20:17:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash_md.c,v 1.6.2.2 2005/12/02 01:59:44 iliaa Exp $ */
+/* $Id: hash_md.c,v 1.6.2.3 2005/12/03 01:17:48 pollita Exp $ */
#include "php_hash.h"
#include "php_hash_md.h"
@@ -30,8 +30,59 @@
sizeof(PHP_MD5_CTX)
};
+php_hash_ops php_hash_md4_ops = {
+ (php_hash_init_func_t) PHP_MD4Init,
+ (php_hash_update_func_t) PHP_MD4Update,
+ (php_hash_final_func_t) PHP_MD4Final,
+ 16,
+ 64,
+ sizeof(PHP_MD4_CTX)
+};
+
+/* MD common stuff */
+
+static unsigned char PADDING[64] =
+{
+ 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
+};
+
+/* {{{ Encode
+ Encodes input (php_hash_uint32) into output (unsigned char). Assumes len is
+ a multiple of 4.
+ */
+static void Encode(unsigned char *output, php_hash_uint32 *input, unsigned int
len)
+{
+ unsigned int i, j;
+
+ for (i = 0, j = 0; j < len; i++, j += 4) {
+ output[j] = (unsigned char) (input[i] & 0xff);
+ output[j + 1] = (unsigned char) ((input[i] >> 8) & 0xff);
+ output[j + 2] = (unsigned char) ((input[i] >> 16) & 0xff);
+ output[j + 3] = (unsigned char) ((input[i] >> 24) & 0xff);
+ }
+}
+/* }}} */
+
+/* {{{ Decode
+ Decodes input (unsigned char) into output (php_hash_uint32). Assumes len is
+ a multiple of 4.
+ */
+static void Decode(php_hash_uint32 *output, const unsigned char *input,
unsigned int len)
+{
+ unsigned int i, j;
+
+ for (i = 0, j = 0; j < len; i++, j += 4)
+ output[i] = ((php_hash_uint32) input[j]) | (((php_hash_uint32)
input[j + 1]) << 8) |
+ (((php_hash_uint32) input[j + 2]) << 16) |
(((php_hash_uint32) input[j + 3]) << 24);
+}
+/* }}} */
+
#ifdef PHP_HASH_MD5_NOT_IN_CORE
+/* MD5 */
+
PHP_HASH_API void make_digest(char *md5str, unsigned char *digest)
{
php_hash_bin2hex(md5str, digest, 16);
@@ -144,7 +195,6 @@
/* Constants for MD5Transform routine.
*/
-
#define S11 7
#define S12 12
#define S13 17
@@ -163,15 +213,6 @@
#define S44 21
static void MD5Transform(php_hash_uint32[4], const unsigned char[64]);
-static void Encode(unsigned char *, php_hash_uint32 *, unsigned int);
-static void Decode(php_hash_uint32 *, const unsigned char *, unsigned int);
-
-static unsigned char PADDING[64] =
-{
- 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
-};
/* F, G, H and I are basic MD5 functions.
*/
@@ -388,45 +429,156 @@
}
/* }}} */
-/* {{{ Encode
- Encodes input (php_hash_uint32) into output (unsigned char). Assumes len is
- a multiple of 4.
+#endif /* PHP_HASH_MD5_NOT_IN_CORE */
+
+/* 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_H(x,y,z) ((x) ^ (y) ^ (z))
+
+#define ROTL32(s,v) (((v) << (s)) | ((v) >> (32 -
(s))))
+
+#define MD4_R1(a,b,c,d,k,s) a = ROTL32(s, a + MD4_F(b,c,d) + x[k])
+#define MD4_R2(a,b,c,d,k,s) a = ROTL32(s, a + MD4_G(b,c,d) + x[k] +
0x5A827999)
+#define MD4_R3(a,b,c,d,k,s) a = ROTL32(s, a + MD4_H(b,c,d) + x[k] +
0x6ED9EBA1)
+
+static void MD4Transform(php_hash_uint32 state[4], const unsigned char
block[64])
+{
+ php_hash_uint32 a = state[0], b = state[1], c = state[2], d = state[3],
x[16];
+
+ Decode(x, block, 64);
+
+ /* Round 1 */
+ MD4_R1(a,b,c,d, 0, 3);
+ MD4_R1(d,a,b,c, 1, 7);
+ MD4_R1(c,d,a,b, 2,11);
+ MD4_R1(b,c,d,a, 3,19);
+ MD4_R1(a,b,c,d, 4, 3);
+ MD4_R1(d,a,b,c, 5, 7);
+ MD4_R1(c,d,a,b, 6,11);
+ MD4_R1(b,c,d,a, 7,19);
+ MD4_R1(a,b,c,d, 8, 3);
+ MD4_R1(d,a,b,c, 9, 7);
+ MD4_R1(c,d,a,b,10,11);
+ MD4_R1(b,c,d,a,11,19);
+ MD4_R1(a,b,c,d,12, 3);
+ MD4_R1(d,a,b,c,13, 7);
+ MD4_R1(c,d,a,b,14,11);
+ MD4_R1(b,c,d,a,15,19);
+
+ /* Round 2 */
+ MD4_R2(a,b,c,d, 0, 3);
+ MD4_R2(d,a,b,c, 4, 5);
+ MD4_R2(c,d,a,b, 8, 9);
+ MD4_R2(b,c,d,a,12,13);
+ MD4_R2(a,b,c,d, 1, 3);
+ MD4_R2(d,a,b,c, 5, 5);
+ MD4_R2(c,d,a,b, 9, 9);
+ MD4_R2(b,c,d,a,13,13);
+ MD4_R2(a,b,c,d, 2, 3);
+ MD4_R2(d,a,b,c, 6, 5);
+ MD4_R2(c,d,a,b,10, 9);
+ MD4_R2(b,c,d,a,14,13);
+ MD4_R2(a,b,c,d, 3, 3);
+ MD4_R2(d,a,b,c, 7, 5);
+ MD4_R2(c,d,a,b,11, 9);
+ MD4_R2(b,c,d,a,15,13);
+
+ /* Round 3 */
+ MD4_R3(a,b,c,d, 0, 3);
+ MD4_R3(d,a,b,c, 8, 9);
+ MD4_R3(c,d,a,b, 4,11);
+ MD4_R3(b,c,d,a,12,15);
+ MD4_R3(a,b,c,d, 2, 3);
+ MD4_R3(d,a,b,c,10, 9);
+ MD4_R3(c,d,a,b, 6,11);
+ MD4_R3(b,c,d,a,14,15);
+ MD4_R3(a,b,c,d, 1, 3);
+ MD4_R3(d,a,b,c, 9, 9);
+ MD4_R3(c,d,a,b, 5,11);
+ MD4_R3(b,c,d,a,13,15);
+ MD4_R3(a,b,c,d, 3, 3);
+ MD4_R3(d,a,b,c,11, 9);
+ MD4_R3(c,d,a,b, 7,11);
+ MD4_R3(b,c,d,a,15,15);
+
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+}
+
+/* {{{ PHP_MD4Update
+ MD4 block update operation. Continues an MD5 message-digest
+ operation, processing another message block, and updating the
+ context.
*/
-static void Encode(output, input, len)
-unsigned char *output;
-php_hash_uint32 *input;
-unsigned int len;
+PHP_HASH_API void PHP_MD4Update(PHP_MD4_CTX * context, const unsigned char
*input, unsigned int inputLen)
{
- unsigned int i, j;
+ unsigned int i, index, partLen;
- for (i = 0, j = 0; j < len; i++, j += 4) {
- output[j] = (unsigned char) (input[i] & 0xff);
- output[j + 1] = (unsigned char) ((input[i] >> 8) & 0xff);
- output[j + 2] = (unsigned char) ((input[i] >> 16) & 0xff);
- output[j + 3] = (unsigned char) ((input[i] >> 24) & 0xff);
+ /* Compute number of bytes mod 64 */
+ index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
+
+ /* Update number of bits */
+ if ((context->count[0] += ((php_hash_uint32) inputLen << 3))
+ < ((php_hash_uint32) inputLen << 3))
+ context->count[1]++;
+ context->count[1] += ((php_hash_uint32) inputLen >> 29);
+
+ partLen = 64 - index;
+
+ /* Transform as many times as possible.
+ */
+ if (inputLen >= partLen) {
+ memcpy((unsigned char*) & context->buffer[index], (unsigned
char*) input, partLen);
+ MD4Transform(context->state, context->buffer);
+
+ for (i = partLen; i + 63 < inputLen; i += 64) {
+ MD4Transform(context->state, &input[i]);
+ }
+
+ index = 0;
+ } else {
+ i = 0;
}
+
+ /* Buffer remaining input */
+ memcpy((unsigned char*) & context->buffer[index], (unsigned char*) &
input[i], inputLen - i);
}
/* }}} */
-/* {{{ Decode
- Decodes input (unsigned char) into output (php_hash_uint32). Assumes len is
- a multiple of 4.
+/* {{{ PHP_MD4Final
+ MD4 finalization. Ends an MD4 message-digest operation, writing the
+ the message digest and zeroizing the context.
*/
-static void Decode(output, input, len)
-php_hash_uint32 *output;
-const unsigned char *input;
-unsigned int len;
+PHP_HASH_API void PHP_MD4Final(unsigned char digest[16], PHP_MD4_CTX * context)
{
- unsigned int i, j;
+ unsigned char bits[8];
+ unsigned int index, padLen;
- for (i = 0, j = 0; j < len; i++, j += 4)
- output[i] = ((php_hash_uint32) input[j]) | (((php_hash_uint32)
input[j + 1]) << 8) |
- (((php_hash_uint32) input[j + 2]) << 16) |
(((php_hash_uint32) input[j + 3]) << 24);
+ /* Save number of bits */
+ Encode(bits, context->count, 8);
+
+ /* Pad out to 56 mod 64.
+ */
+ index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
+ padLen = (index < 56) ? (56 - index) : (120 - index);
+ PHP_MD4Update(context, PADDING, padLen);
+
+ /* Append length (before padding) */
+ PHP_MD4Update(context, bits, 8);
+
+ /* Store state in digest */
+ Encode(digest, context->state, 16);
+
+ /* Zeroize sensitive information.
+ */
+ memset((unsigned char*) context, 0, sizeof(*context));
}
/* }}} */
-#endif /* PHP_HASH_MD5_NOT_IN_CORE */
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_md.h?r1=1.2.2.2&r2=1.2.2.3&ty=u
Index: php-src/ext/hash/php_hash_md.h
diff -u php-src/ext/hash/php_hash_md.h:1.2.2.2
php-src/ext/hash/php_hash_md.h:1.2.2.3
--- php-src/ext/hash/php_hash_md.h:1.2.2.2 Thu Dec 1 20:59:45 2005
+++ php-src/ext/hash/php_hash_md.h Fri Dec 2 20:17:48 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_hash_md.h,v 1.2.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash_md.h,v 1.2.2.3 2005/12/03 01:17:48 pollita Exp $ */
#ifndef PHP_HASH_MD_H
#define PHP_HASH_MD_H
@@ -58,7 +58,6 @@
documentation and/or software.
*/
-#include "ext/standard/basic_functions.h"
/* MD5 context. */
typedef struct {
php_hash_uint32 state[4]; /* state (ABCD)
*/
@@ -75,5 +74,15 @@
PHP_NAMED_FUNCTION(php_if_md5_file);
#endif /* PHP_HASH_MD5_NOT_IN_CORE */
+/* MD4 context */
+typedef struct {
+ php_hash_uint32 state[4];
+ php_hash_uint32 count[2];
+ unsigned char buffer[64];
+} PHP_MD4_CTX;
+
+#define PHP_MD4Init PHP_MD5Init
+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 *);
#endif
http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.10.2.2&r2=1.10.2.3&ty=u
Index: php-src/ext/hash/package.xml
diff -u php-src/ext/hash/package.xml:1.10.2.2
php-src/ext/hash/package.xml:1.10.2.3
--- php-src/ext/hash/package.xml:1.10.2.2 Thu Dec 1 20:59:45 2005
+++ php-src/ext/hash/package.xml Fri Dec 2 20:17:48 2005
@@ -16,7 +16,7 @@
<user>mike</user>
<name>Michael Wallner</name>
<email>[EMAIL PROTECTED]</email>
- <role>developer</role>
+ <role>lead</role>
</maintainer>
</maintainers>
@@ -26,7 +26,7 @@
<date>2005-11-00</date>
<notes>
Initial Release
- * md5
+ * md4, md5
* sha1, sha256, sha384, sha512
* ripemd128, ripemd160
* tiger128, tiger160, tiger192 (3 and 4 passes)
@@ -67,6 +67,7 @@
<file role="doc" name="README"/>
<dir role="test" name="tests">
<file role="test" name="hmac-md5.phpt"/>
+ <file role="test" name="md4.phpt"/>
<file role="test" name="md5.phpt"/>
<file role="test" name="sha1.phpt"/>
<file role="test" name="sha256.phpt"/>
http://cvs.php.net/co.php/php-src/ext/hash/tests/md4.phpt?r=1.1&p=1
Index: php-src/ext/hash/tests/md4.phpt
+++ php-src/ext/hash/tests/md4.phpt
--TEST--
md4 algorithm
--SKIPIF--
<?php if(!extension_loaded("hash")) print "skip"; ?>
--FILE--
<?php
/* RFC 1320 vectors */
echo hash('md4', '') . "\n";
echo hash('md4', 'a') . "\n";
echo hash('md4', 'abc') . "\n";
echo hash('md4', 'message digest') . "\n";
echo hash('md4', 'abcdefghijklmnopqrstuvwxyz') . "\n";
echo hash('md4',
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') . "\n";
echo hash('md4',
'12345678901234567890123456789012345678901234567890123456789012345678901234567890')
. "\n";
--EXPECT--
31d6cfe0d16ae931b73c59d7e0c089c0
bde52cb31de33e46245e05fbdbd6fb24
a448017aaf21d8525fc10ae87aa6729d
d9130a8164549fe818874806e1c7014b
d79e1c308aa5bbcdeea8ed63df412da9
043f8582f241db351ce627e153e7f0e4
e33b4ddc9c38f2199c3e7b164fcc0536
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
