diff options
| -rw-r--r-- | 0001-add-extension-version-in-phpinfo.patch | 26 | ||||
| -rw-r--r-- | 0002-drop-null-value-deprecated-in-8.1.patch | 100 |
2 files changed, 126 insertions, 0 deletions
diff --git a/0001-add-extension-version-in-phpinfo.patch b/0001-add-extension-version-in-phpinfo.patch new file mode 100644 index 0000000..44af7f2 --- /dev/null +++ b/0001-add-extension-version-in-phpinfo.patch @@ -0,0 +1,26 @@ +From 6cf8c800f2926b65867b10dfe582bbb4596d1b7e Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 2 Dec 2020 11:37:43 +0100 +Subject: [PATCH 1/2] add extension version in phpinfo + +--- + mcrypt.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mcrypt.c b/mcrypt.c +index 20f6aae..b834ffe 100644 +--- a/mcrypt.c ++++ b/mcrypt.c +@@ -480,7 +480,8 @@ PHP_MINFO_FUNCTION(mcrypt) /* {{{ */ + php_info_print_table_start(); + php_info_print_table_header(2, "mcrypt support", "enabled"); + php_info_print_table_header(2, "mcrypt_filter support", "enabled"); +- php_info_print_table_row(2, "Version", LIBMCRYPT_VERSION); ++ php_info_print_table_row(2, "Extension version", PHP_MCRYPT_VERSION); ++ php_info_print_table_row(2, "Library version", LIBMCRYPT_VERSION); + php_info_print_table_row(2, "Api No", mcrypt_api_no); + php_info_print_table_row(2, "Supported ciphers", ZSTR_VAL(tmp1.s)); + php_info_print_table_row(2, "Supported modes", ZSTR_VAL(tmp2.s)); +-- +2.31.1 + diff --git a/0002-drop-null-value-deprecated-in-8.1.patch b/0002-drop-null-value-deprecated-in-8.1.patch new file mode 100644 index 0000000..3554ff3 --- /dev/null +++ b/0002-drop-null-value-deprecated-in-8.1.patch @@ -0,0 +1,100 @@ +From 5b16bf1c97c1bbab400fc877285bf0919ae73256 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 9 Jun 2021 10:49:51 +0200 +Subject: [PATCH 2/2] drop null value, deprecated in 8.1 + +--- + tests/mcrypt_rijndael128_128BitKey.phpt | 30 ++++++------------------- + 1 file changed, 7 insertions(+), 23 deletions(-) + +diff --git a/tests/mcrypt_rijndael128_128BitKey.phpt b/tests/mcrypt_rijndael128_128BitKey.phpt +index ffc5e39..84abac8 100644 +--- a/tests/mcrypt_rijndael128_128BitKey.phpt ++++ b/tests/mcrypt_rijndael128_128BitKey.phpt +@@ -32,14 +32,12 @@ $data = 'This is the secret message which must be encrypted'; + + // keys up to 128 bits (16 bytes) + $keys = array( +- null, + '', + '12345678', + '1234567890123456' + ); + // rijndael128 is a block cipher of 128 bits (16 bytes) + $ivs = array( +- null, + '', + '12345678', + '1234567890123456', +@@ -72,61 +70,47 @@ foreach ($ivs as $iv) { + + key length=0 + +-Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45 +- +-Warning: mcrypt_encrypt(): Key of size 0 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d +-string(0) "" +- +-key length=0 +- +-Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45 ++Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + + Warning: mcrypt_encrypt(): Key of size 0 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d + string(0) "" + + key length=8 + +-Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45 ++Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + + Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d + string(0) "" + + key length=16 + +-Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45 ++Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + string(128) "dc8f957ec530acf10cd95ba7da7b6405380fe19a2941e9a8de54680512f18491bc374e5464885ae6c2ae2aa7a6cdd2fbe12a06bbc4bd59dbbfaa15f09044f101" + + --- testing different iv lengths + + iv length=0 + +-Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53 +- +-Warning: mcrypt_decrypt(): Received initialization vector of size 0, but size 16 is required for this encryption mode in %s on line %d +-string(0) "" +- +-iv length=0 +- +-Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53 ++Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + + Warning: mcrypt_decrypt(): Received initialization vector of size 0, but size 16 is required for this encryption mode in %s on line %d + string(0) "" + + iv length=8 + +-Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53 ++Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + + Warning: mcrypt_decrypt(): Received initialization vector of size 8, but size 16 is required for this encryption mode in %s on line %d + string(0) "" + + iv length=16 + +-Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53 ++Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + string(32) "42adc8c0db19473f2c684ff2d6e828a5" + + iv length=17 + +-Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53 ++Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line %d + + Warning: mcrypt_decrypt(): Received initialization vector of size 17, but size 16 is required for this encryption mode in %s on line %d + string(0) "" +-- +2.31.1 + |