Added the mhash HMAC functionality. Now the mhash function can use

keyed hash by added the key as an extra parameter to the function.

diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
index 02f2cb0d7a05cb2bd472ccb87d604acc6f679094..11f9730c45e164d6c27e0e9e53db39272a0567a4 100644 (file)
--- a/ext/mhash/mhash.c
+++ b/ext/mhash/mhash.c
@@ -13,6 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   |          Nikos Mavroyanopoulos <nmav@hellug.gr>                      |
    +----------------------------------------------------------------------+
  */
 
@@ -20,22 +21,25 @@
 
 #if HAVE_LIBMHASH
 
+#include "fcntl.h"
 #include "php_mhash.h"
-
 #include "mhash.h"
+#include "php_ini.h"
+#include "php_globals.h"
+#include "ext/standard/info.h"
 
 function_entry mhash_functions[] = {
        PHP_FE(mhash_get_block_size, NULL)
-       PHP_FE(mhash_get_hash_name, NULL)
-       PHP_FE(mhash_count, NULL)
-       PHP_FE(mhash, NULL)
-       {0},
+           PHP_FE(mhash_get_hash_name, NULL)
+           PHP_FE(mhash_count, NULL)
+       PHP_FE(mhash, NULL) {0}
+       ,
 };
 
 static PHP_MINIT_FUNCTION(mhash);
 
 zend_module_entry mhash_module_entry = {
-       "mhash", 
+       "mhash",
        mhash_functions,
        PHP_MINIT(mhash), NULL,
        NULL, NULL,
@@ -46,24 +50,24 @@ zend_module_entry mhash_module_entry = {
 #ifdef COMPILE_DL_MHASH
 ZEND_GET_MODULE(mhash)
 #endif
-
 #define MHASH_FAILED_MSG "mhash initialization failed"
-
 static PHP_MINIT_FUNCTION(mhash)
 {
        int i;
        char *name;
        char buf[128];
 
-       for(i = 0; i <= mhash_count(); i++) {
+       for (i = 0; i <= mhash_count(); i++) {
                name = mhash_get_hash_name(i);
-               if(name) {
+               if (name) {
                        snprintf(buf, 127, "MHASH_%s", name);
-                       zend_register_long_constant(buf, strlen(buf) + 1, i, CONST_PERSISTENT, module_number ELS_CC);
+                       zend_register_long_constant(buf, strlen(buf) + 1,
+                                                   i, CONST_PERSISTENT,
+                                                   module_number ELS_CC);
                        free(name);
                }
        }
-       
+
        return SUCCESS;
 }
 
@@ -73,6 +77,7 @@ PHP_FUNCTION(mhash_count)
 {
        RETURN_LONG(mhash_count());
 }
+
 /* }}} */
 
 /* {{{ proto int mhash_get_block_size(int hash)
@@ -81,7 +86,8 @@ PHP_FUNCTION(mhash_get_block_size)
 {
        pval **hash;
 
-       if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &hash) == FAILURE) {
+       if (ZEND_NUM_ARGS() != 1
+           || zend_get_parameters_ex(1, &hash) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
 
@@ -89,6 +95,7 @@ PHP_FUNCTION(mhash_get_block_size)
 
        RETURN_LONG(mhash_get_block_size((*hash)->value.lval));
 }
+
 /* }}} */
 
 /* {{{ proto string mhash_get_hash_name(int hash)
@@ -98,57 +105,91 @@ PHP_FUNCTION(mhash_get_hash_name)
        pval **hash;
        char *name;
 
-       if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &hash) == FAILURE) {
+       if (ZEND_NUM_ARGS() != 1
+           || zend_get_parameters_ex(1, &hash) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
 
        convert_to_long_ex(hash);
 
        name = mhash_get_hash_name((*hash)->value.lval);
-       if(name) {
+       if (name) {
                RETVAL_STRING(name, 1);
                free(name);
        } else {
                RETVAL_FALSE;
        }
 }
+
 /* }}} */
 
-/* {{{ proto string mhash(int hash, string data)
+/* {{{ proto string mhash(int hash, string data, [string key])
    hash data with hash */
 PHP_FUNCTION(mhash)
 {
-       pval **hash, **data;
+       pval **hash, **data, **key;
        MHASH td;
        int bsize;
        unsigned char *hash_data;
+       int num_args;
+
+       num_args = ZEND_NUM_ARGS();
 
-       if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &hash, &data) == FAILURE) {
+       if (num_args < 2 || num_args > 3) {
                WRONG_PARAM_COUNT;
        }
+       if (num_args == 2) {    /* 2 arguments, just hash */
+               if (zend_get_parameters_ex(2, &hash, &data) == FAILURE) {
+                       WRONG_PARAM_COUNT;
+               }
+       } else {                /* 3 arguments, do HMAC hash (keyed hash) */
+               if (zend_get_parameters_ex(3, &hash, &data, &key) ==
+                   FAILURE) {
+                       WRONG_PARAM_COUNT;
+               }
+               convert_to_string_ex(key);
+       }
 
        convert_to_long_ex(hash);
        convert_to_string_ex(data);
 
        bsize = mhash_get_block_size((*hash)->value.lval);
-       td = mhash_init((*hash)->value.lval);
-       if(td == MHASH_FAILED) {
+
+       if (num_args == 3) {
+               if (mhash_get_hash_pblock((*hash)->value.lval) == 0) {
+                       php_error(E_WARNING, MHASH_FAILED_MSG);
+                       RETURN_FALSE;
+               }
+               td =
+                   mhash_hmac_init((*hash)->value.lval,
+                                   (*key)->value.str.val,
+                                   (*key)->value.str.len,
+                                   mhash_get_hash_pblock((*hash)->value.
+                                                         lval));
+       } else {
+               td = mhash_init((*hash)->value.lval);
+       }
+       if (td == MHASH_FAILED) {
                php_error(E_WARNING, MHASH_FAILED_MSG);
                RETURN_FALSE;
        }
 
        mhash(td, (*data)->value.str.val, (*data)->value.str.len);
 
-       hash_data = (unsigned char *) mhash_end(td);
-       
+       if (num_args == 3) {
+               hash_data = (unsigned char *) mhash_hmac_end(td);
+       } else {
+               hash_data = (unsigned char *) mhash_end(td);
+       }
        if (hash_data) {
                RETVAL_STRINGL(hash_data, bsize, 1);
-       
-               free(hash_data);
+               mhash_free(hash_data);
        } else {
                RETURN_FALSE;
        }
 }
+
 /* }}} */
 
+
 #endif