MFB: Make the old mhash API a wrapper around hash, this removes a dependency.

1 files changed, 0 insertions, 29 deletions

diff --git a/ext/mhash/php_mhash.h b/ext/mhash/php_mhash.h
index f935951026..0d054990fb 100644
--- a/ext/mhash/php_mhash.h
+++ b/ext/mhash/php_mhash.h
@@ -21,40 +21,11 @@
 #ifndef PHP_MHASH_H
 #define PHP_MHASH_H
 
-#if HAVE_LIBMHASH
-
-#if PHP_API_VERSION < 19990421
-#define  zend_module_entry zend_module_entry
-#include "zend_modules.h"
-#include "internal_functions.h"
-#endif
-
-#include "mhash.h"
-
 extern zend_module_entry mhash_module_entry;
 #define mhash_module_ptr &mhash_module_entry
 
-int php_mhash(hashid hash, const char *input_str, int input_len, const char *key_str, int key_len, char **enc, int *len TSRMLS_DC);
-int php_mhash_keygen(keygenid type, hashid hash1, hashid hash2, const char *pass_str, int pass_len, const char *salt_str, size_t salt_len, char **key, int *len, int max_len, int max_count TSRMLS_DC);
-
 PHP_MINIT_FUNCTION(mhash);
 PHP_MINFO_FUNCTION(mhash);
-PHP_FUNCTION(mhash_count);
-PHP_FUNCTION(mhash_get_block_size);
-PHP_FUNCTION(mhash_get_hash_name);
-PHP_FUNCTION(mhash_keygen_count);
-PHP_FUNCTION(mhash_get_keygen_name);
-PHP_FUNCTION(mhash_keygen_uses_hash);
-PHP_FUNCTION(mhash_keygen_uses_salt);
-PHP_FUNCTION(mhash_get_keygen_salt_size);
-PHP_FUNCTION(mhash_keygen_uses_count);
-PHP_FUNCTION(mhash);
-PHP_FUNCTION(mhash_keygen);
-PHP_FUNCTION(mhash_keygen_s2k);
-
-#else
-#define mhash_module_ptr NULL
-#endif
 
 #define phpext_mhash_ptr mhash_module_ptr