Skip to content

[PHP-8.5] Backports for OpenSSL 4.1 - #25139

Closed
thesamesam wants to merge 2 commits into
php:PHP-8.5from
thesamesam:PHP-8.5-openssl-4
Closed

thesamesam wants to merge 2 commits into
php:PHP-8.5from
thesamesam:PHP-8.5-openssl-4

Conversation

@thesamesam

Copy link
Copy Markdown
Contributor

This passes the testsuite but I haven't done any further testing for it. Please give the php_openssl_matches_common_name changes in the first commit a careful look. The rest applied pretty cleanly from PHP-8.6.

@thesamesam
thesamesam requested a review from bukka as a code owner November 1, 2026 21:11
@thesamesam
thesamesam changed the base branch from master to PHP-8.5 November 1, 2026 21:12
@NattyNarwhal

Copy link
Copy Markdown
Member

@LamentXU123 You might be interested in this since you did the fixes for newer branches.

@LamentXU123

Copy link
Copy Markdown
Member

CI failure is related.

@thesamesam

Copy link
Copy Markdown
Contributor Author

Yeah, I'll handle it tomorrow.

@thesamesam
thesamesam marked this pull request as draft November 2, 2026 06:30
@thesamesam
thesamesam marked this pull request as ready for review November 3, 2026 03:13
shivammathur and others added 2 commits November 3, 2026 03:55
* Fix OpenSSL 4 test compatibility

* Fix OpenSSL 4 build compatibility

* Use OpenSSL 4 in macOS CI

* Fix OpenSSL 1.1 build compatibility

* Preserve raw CN matching with OpenSSL 4

(cherry picked from commit 6aca6e3)
OpenSSL 4.1 deprecates ASN1_STRING_set() and ASN1_STRING_length().
use ASN1_STRING_set1_data() and ASN1_STRING_get_length() instead as
recommended in official doc
https://docs.openssl.org/4.1/man7/ossl-guide-migration/#asn1_string-values-have-never-been-nul-byte-terminated

(cherry picked from commit 3678f39)
@LamentXU123

LamentXU123 commented Nov 3, 2026 •

Copy link
Copy Markdown
Member

Can you also move this test to 8.4 and 8.5?

@LamentXU123

Copy link
Copy Markdown
Member

Okay never mind I will do it in merging. Thank you!

LamentXU123 added a commit that referenced this pull request Nov 3, 2026
* PHP-8.5:
  Merge branch 'PHP-8.4' into PHP-8.5
  ext/openssl: Restore OpenSSL 4.x compatibility on PHP 8.5 (#25139)
@thesamesam

Copy link
Copy Markdown
Contributor Author

Thank you!

@thesamesam
thesamesam deleted the PHP-8.5-openssl-4 branch November 3, 2026 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants