Skip to content

Commit 39ab410

Browse files
committed
Remove duplicate md5/sha1 implementation
This code was actually unused since its introduction, and since at least the md5 implementation in the core was completely overhauled, we're dropping the md5 and sha1 related stuff from ext/hash.
1 parent 69cf535 commit 39ab410

File tree

5 files changed

+0
-786
lines changed

5 files changed

+0
-786
lines changed

ext/hash/hash.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,30 +1305,6 @@ PHP_MINFO_FUNCTION(hash)
13051305
/* }}} */
13061306

13071307
/* {{{ arginfo */
1308-
#ifdef PHP_HASH_MD5_NOT_IN_CORE
1309-
ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5, 0, 0, 1)
1310-
ZEND_ARG_INFO(0, str)
1311-
ZEND_ARG_INFO(0, raw_output)
1312-
ZEND_END_ARG_INFO()
1313-
1314-
ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5_file, 0, 0, 1)
1315-
ZEND_ARG_INFO(0, filename)
1316-
ZEND_ARG_INFO(0, raw_output)
1317-
ZEND_END_ARG_INFO()
1318-
#endif
1319-
1320-
#ifdef PHP_HASH_SHA1_NOT_IN_CORE
1321-
ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1, 0, 0, 1)
1322-
ZEND_ARG_INFO(0, str)
1323-
ZEND_ARG_INFO(0, raw_output)
1324-
ZEND_END_ARG_INFO()
1325-
1326-
ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1_file, 0, 0, 1)
1327-
ZEND_ARG_INFO(0, filename)
1328-
ZEND_ARG_INFO(0, raw_output)
1329-
ZEND_END_ARG_INFO()
1330-
#endif
1331-
13321308
ZEND_BEGIN_ARG_INFO_EX(arginfo_hash, 0, 0, 2)
13331309
ZEND_ARG_INFO(0, algo)
13341310
ZEND_ARG_INFO(0, data)
@@ -1463,17 +1439,6 @@ static const zend_function_entry hash_functions[] = {
14631439
PHP_FE(hash_equals, arginfo_hash_equals)
14641440
PHP_FE(hash_hkdf, arginfo_hash_hkdf)
14651441

1466-
/* BC Land */
1467-
#ifdef PHP_HASH_MD5_NOT_IN_CORE
1468-
PHP_NAMED_FE(md5, php_if_md5, arginfo_hash_md5)
1469-
PHP_NAMED_FE(md5_file, php_if_md5_file, arginfo_hash_md5_file)
1470-
#endif /* PHP_HASH_MD5_NOT_IN_CORE */
1471-
1472-
#ifdef PHP_HASH_SHA1_NOT_IN_CORE
1473-
PHP_NAMED_FE(sha1, php_if_sha1, arginfo_hash_sha1)
1474-
PHP_NAMED_FE(sha1_file, php_if_sha1_file, arginfo_hash_sha1_file)
1475-
#endif /* PHP_HASH_SHA1_NOT_IN_CORE */
1476-
14771442
#ifdef PHP_MHASH_BC
14781443
PHP_FE(mhash_keygen_s2k, arginfo_mhash_keygen_s2k)
14791444
PHP_FE(mhash_get_block_size, arginfo_mhash_get_block_size)

0 commit comments

Comments
 (0)