From ec4d926a80fe93c80d2b52f0178bc627097d9288 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 5 Aug 2021 16:30:55 +0200 Subject: [PATCH] Use different algorithm in cms tests Same as with pkcs7, switch these tests to use an algorithm that OpenSSL 3 supports out of the box. Once again, we should consider changing the default or making it required. --- ext/openssl/tests/openssl_cms_decrypt_basic.phpt | 3 ++- ext/openssl/tests/openssl_cms_encrypt_der.phpt | 3 ++- ext/openssl/tests/openssl_cms_encrypt_pem.phpt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ext/openssl/tests/openssl_cms_decrypt_basic.phpt b/ext/openssl/tests/openssl_cms_decrypt_basic.phpt index de3f67a7988..32d03a513a2 100644 --- a/ext/openssl/tests/openssl_cms_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_cms_decrypt_basic.phpt @@ -15,8 +15,9 @@ $single_cert = "file://" . __DIR__ . "/cert.crt"; $headers = array("test@test", "testing openssl_cms_encrypt()"); $wrong = "wrong"; $empty = ""; +$cipher = OPENSSL_CIPHER_AES_128_CBC; -openssl_cms_encrypt($infile, $encrypted, $single_cert, $headers); +openssl_cms_encrypt($infile, $encrypted, $single_cert, $headers, cipher_algo: $cipher); var_dump(openssl_cms_decrypt($encrypted, $outfile, $single_cert, $privkey)); print("\nDecrypted text:\n"); diff --git a/ext/openssl/tests/openssl_cms_encrypt_der.phpt b/ext/openssl/tests/openssl_cms_encrypt_der.phpt index c32c5e9a518..2f26428c2a6 100644 --- a/ext/openssl/tests/openssl_cms_encrypt_der.phpt +++ b/ext/openssl/tests/openssl_cms_encrypt_der.phpt @@ -13,8 +13,9 @@ $decryptfile = $tname . ".out"; $single_cert = "file://" . __DIR__ . "/cert.crt"; $privkey = "file://" . __DIR__ . "/private_rsa_1024.key"; $headers = array("test@test", "testing openssl_cms_encrypt()"); +$cipher = OPENSSL_CIPHER_AES_128_CBC; -var_dump(openssl_cms_encrypt($infile, $cryptfile, $single_cert, $headers, OPENSSL_CMS_BINARY, OPENSSL_ENCODING_DER)); +var_dump(openssl_cms_encrypt($infile, $cryptfile, $single_cert, $headers, OPENSSL_CMS_BINARY, OPENSSL_ENCODING_DER, $cipher)); if (openssl_cms_decrypt($cryptfile, $decryptfile, $single_cert, $privkey, OPENSSL_ENCODING_DER) == false) { print "DER decrypt error\n"; print "recipient:\n"; diff --git a/ext/openssl/tests/openssl_cms_encrypt_pem.phpt b/ext/openssl/tests/openssl_cms_encrypt_pem.phpt index a9ddc4ef52f..6d26629c8d3 100644 --- a/ext/openssl/tests/openssl_cms_encrypt_pem.phpt +++ b/ext/openssl/tests/openssl_cms_encrypt_pem.phpt @@ -13,8 +13,9 @@ $decryptfile = $tname . ".pemout"; $single_cert = "file://" . __DIR__ . "/cert.crt"; $privkey = "file://" . __DIR__ . "/private_rsa_1024.key"; $headers = array("test@test", "testing openssl_cms_encrypt()"); +$cipher = OPENSSL_CIPHER_AES_128_CBC; -var_dump(openssl_cms_encrypt($infile, $cryptfile, $single_cert, $headers, OPENSSL_CMS_BINARY, OPENSSL_ENCODING_PEM)); +var_dump(openssl_cms_encrypt($infile, $cryptfile, $single_cert, $headers, OPENSSL_CMS_BINARY, OPENSSL_ENCODING_PEM, $cipher)); if (openssl_cms_decrypt($cryptfile, $decryptfile, $single_cert, $privkey, OPENSSL_ENCODING_PEM) == false) { print "PEM decrypt error\n"; print "recipient:\n";