Skip to content

Commit 563b3e3

Browse files
committed
Use different algorithm in pkcs7 tests
The default of OPENSSL_CIPHER_RC2_40 is no longer (non-legacy) supported in OpenSSL 3, specify a newer cipher instead. We should probably either change the default (if acceptable) or make the parameter required.
1 parent cb48260 commit 563b3e3

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ $single_cert = "file://" . __DIR__ . "/cert.crt";
1919
$headers = array("test@test", "testing openssl_pkcs7_encrypt()");
2020
$wrong = "wrong";
2121
$empty = "";
22+
$cipher = OPENSSL_CIPHER_AES_128_CBC;
2223

23-
openssl_pkcs7_encrypt($infile, $encrypted, $single_cert, $headers);
24+
openssl_pkcs7_encrypt($infile, $encrypted, $single_cert, $headers, 0, $cipher);
2425
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $privkey));
2526
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, openssl_x509_read($single_cert), $privkey));
2627
var_dump(openssl_pkcs7_decrypt($encrypted, $outfile, $single_cert, $wrong));

ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ $headers = array("test@test", "testing openssl_pkcs7_encrypt()");
2020
$empty_headers = array();
2121
$wrong = "wrong";
2222
$empty = "";
23+
$cipher = OPENSSL_CIPHER_AES_128_CBC;
2324

24-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $headers));
25-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, openssl_x509_read($single_cert), $headers));
25+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $headers, 0, $cipher));
26+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, openssl_x509_read($single_cert), $headers, 0, $cipher));
2627
var_dump(openssl_pkcs7_decrypt($outfile, $outfile2, $single_cert, $privkey));
27-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $assoc_headers));
28-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $empty_headers));
29-
var_dump(openssl_pkcs7_encrypt($wrong, $outfile, $single_cert, $headers));
30-
var_dump(openssl_pkcs7_encrypt($empty, $outfile, $single_cert, $headers));
31-
var_dump(openssl_pkcs7_encrypt($infile, $empty, $single_cert, $headers));
32-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $wrong, $headers));
33-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $empty, $headers));
34-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $multi_certs, $headers));
35-
var_dump(openssl_pkcs7_encrypt($infile, $outfile, array_map('openssl_x509_read', $multi_certs) , $headers));
28+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $assoc_headers, 0, $cipher));
29+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $single_cert, $empty_headers, 0, $cipher));
30+
var_dump(openssl_pkcs7_encrypt($wrong, $outfile, $single_cert, $headers, 0, $cipher));
31+
var_dump(openssl_pkcs7_encrypt($empty, $outfile, $single_cert, $headers, 0, $cipher));
32+
var_dump(openssl_pkcs7_encrypt($infile, $empty, $single_cert, $headers, 0, $cipher));
33+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $wrong, $headers, 0, $cipher));
34+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $empty, $headers, 0, $cipher));
35+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, $multi_certs, $headers, 0, $cipher));
36+
var_dump(openssl_pkcs7_encrypt($infile, $outfile, array_map('openssl_x509_read', $multi_certs), $headers, 0, $cipher));
3637

3738
if (file_exists($outfile)) {
3839
echo "true\n";

0 commit comments

Comments
 (0)