@@ -200,49 +200,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_decrypt, 0, 0, 5)
200200ZEND_ARG_INFO(0, iv)
201201ZEND_END_ARG_INFO()
202202203-ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ecb, 0, 0, 5)
204-ZEND_ARG_INFO(0, cipher)
205-ZEND_ARG_INFO(0, key)
206-ZEND_ARG_INFO(0, data)
207-ZEND_ARG_INFO(0, mode)
208-ZEND_ARG_INFO(0, iv)
209-ZEND_END_ARG_INFO()
210-211-ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cbc, 0, 0, 5)
212-ZEND_ARG_INFO(0, cipher)
213-ZEND_ARG_INFO(0, key)
214-ZEND_ARG_INFO(0, data)
215-ZEND_ARG_INFO(0, mode)
216-ZEND_ARG_INFO(0, iv)
217-ZEND_END_ARG_INFO()
218-219-ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cfb, 0, 0, 5)
220-ZEND_ARG_INFO(0, cipher)
221-ZEND_ARG_INFO(0, key)
222-ZEND_ARG_INFO(0, data)
223-ZEND_ARG_INFO(0, mode)
224-ZEND_ARG_INFO(0, iv)
225-ZEND_END_ARG_INFO()
226-227-ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ofb, 0, 0, 5)
228-ZEND_ARG_INFO(0, cipher)
229-ZEND_ARG_INFO(0, key)
230-ZEND_ARG_INFO(0, data)
231-ZEND_ARG_INFO(0, mode)
232-ZEND_ARG_INFO(0, iv)
233-ZEND_END_ARG_INFO()
234-235203ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_create_iv, 0, 0, 1)
236204ZEND_ARG_INFO(0, size)
237205ZEND_ARG_INFO(0, source)
238206ZEND_END_ARG_INFO()
239207/* }}} */
240208241209const zend_function_entry mcrypt_functions[] = { /* {{{ */
242-PHP_DEP_FE(mcrypt_ecb, arginfo_mcrypt_ecb)
243-PHP_DEP_FE(mcrypt_cbc, arginfo_mcrypt_cbc)
244-PHP_DEP_FE(mcrypt_cfb, arginfo_mcrypt_cfb)
245-PHP_DEP_FE(mcrypt_ofb, arginfo_mcrypt_ofb)
246210PHP_FE(mcrypt_get_key_size, arginfo_mcrypt_get_key_size)
247211PHP_FE(mcrypt_get_block_size, arginfo_mcrypt_get_block_size)
248212PHP_FE(mcrypt_get_cipher_name, arginfo_mcrypt_get_cipher_name)
@@ -1342,70 +1306,6 @@ PHP_FUNCTION(mcrypt_decrypt)
13421306}
13431307/* }}} */
134413081345-/* {{{ proto string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
1346- ECB crypt/decrypt data using key key with cipher cipher starting with iv */
1347-PHP_FUNCTION(mcrypt_ecb)
1348-{
1349-zval *mode;
1350-char *cipher, *key, *data, *iv = NULL;
1351-size_t cipher_len, key_len, data_len, iv_len = 0;
1352-1353-MCRYPT_GET_CRYPT_ARGS
1354-1355-convert_to_long_ex(mode);
1356-1357-php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "ecb", iv, iv_len, Z_LVAL_P(mode), return_value);
1358-}
1359-/* }}} */
1360-1361-/* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
1362- CBC crypt/decrypt data using key key with cipher cipher starting with iv */
1363-PHP_FUNCTION(mcrypt_cbc)
1364-{
1365-zval *mode;
1366-char *cipher, *key, *data, *iv = NULL;
1367-size_t cipher_len, key_len, data_len, iv_len = 0;
1368-1369-MCRYPT_GET_CRYPT_ARGS
1370-1371-convert_to_long_ex(mode);
1372-1373-php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "cbc", iv, iv_len, Z_LVAL_P(mode), return_value);
1374-}
1375-/* }}} */
1376-1377-/* {{{ proto string mcrypt_cfb(int cipher, string key, string data, int mode, string iv)
1378- CFB crypt/decrypt data using key key with cipher cipher starting with iv */
1379-PHP_FUNCTION(mcrypt_cfb)
1380-{
1381-zval *mode;
1382-char *cipher, *key, *data, *iv = NULL;
1383-size_t cipher_len, key_len, data_len, iv_len = 0;
1384-1385-MCRYPT_GET_CRYPT_ARGS
1386-1387-convert_to_long_ex(mode);
1388-1389-php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "cfb", iv, iv_len, Z_LVAL_P(mode), return_value);
1390-}
1391-/* }}} */
1392-1393-/* {{{ proto string mcrypt_ofb(int cipher, string key, string data, int mode, string iv)
1394- OFB crypt/decrypt data using key key with cipher cipher starting with iv */
1395-PHP_FUNCTION(mcrypt_ofb)
1396-{
1397-zval *mode;
1398-char *cipher, *key, *data, *iv = NULL;
1399-size_t cipher_len, key_len, data_len, iv_len = 0;
1400-1401-MCRYPT_GET_CRYPT_ARGS
1402-1403-convert_to_long_ex(mode);
1404-1405-php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "ofb", iv, iv_len, Z_LVAL_P(mode), return_value);
1406-}
1407-/* }}} */
1408-14091309/* {{{ proto string mcrypt_create_iv(int size, int source)
14101310 Create an initialization vector (IV) */
14111311PHP_FUNCTION(mcrypt_create_iv)