ocsp: add single-cert stapling fast path and certinfo RAII - #13229
Merged
Conversation
Skip the SSL_get_certificate() lookup and X509_cmp() DER re-parse in the stapling callback when an SSL_CTX has a single certificate. The shortcut is gated to non-dual-cert builds; under HAVE_NATIVE_DUAL_CERT_SUPPORT a CTX can hold multiple certs where only one has OCSP info, so map size alone cannot identify the negotiated cert. Give certinfo a constructor/destructor so its resources are managed by RAII, and allocate it with make_unique. This consolidates the cleanup that was duplicated across certinfo_map_free and the init error path, and fixes two pre-existing leaks (cid and the BoringSSL cert ref) plus an error path that could delete a certinfo_map still owned by the SSL_CTX.
bneradt
requested changes
Jun 8, 2026
Switch the per-SSL_CTX certinfo map to store std::unique_ptr<certinfo> so ownership is explicit and the value cleanup is handled by RAII. This removes the manual delete in certinfo_map_free and closes a leak window at the insert site: the old release()-then-insert dropped the pointer if the key already existed or the insert threw, whereas emplace with a move only transfers ownership once insertion succeeds.
bneradt
approved these changes
Jun 8, 2026
Contributor
|
@c-taylor Do you want us to merge this in to master? |
c-taylor
marked this pull request as ready for review
June 8, 2026 23:00
Contributor
Author
|
Local validations were in progress since my last commit for @bneradt - Good here! |
Contributor
Author
|
All my validations are complete; Good to Merge. |
Contributor
|
Cherry-picked to 10.2.x |
cmcfarlen
pushed a commit
that referenced
this pull request
Jun 16, 2026
* ocsp: add single-cert stapling fast path and certinfo RAII Skip the SSL_get_certificate() lookup and X509_cmp() DER re-parse in the stapling callback when an SSL_CTX has a single certificate. The shortcut is gated to non-dual-cert builds; under HAVE_NATIVE_DUAL_CERT_SUPPORT a CTX can hold multiple certs where only one has OCSP info, so map size alone cannot identify the negotiated cert. Give certinfo a constructor/destructor so its resources are managed by RAII, and allocate it with make_unique. This consolidates the cleanup that was duplicated across certinfo_map_free and the init error path, and fixes two pre-existing leaks (cid and the BoringSSL cert ref) plus an error path that could delete a certinfo_map still owned by the SSL_CTX. * ocsp: make certinfo map own values via unique_ptr Switch the per-SSL_CTX certinfo map to store std::unique_ptr<certinfo> so ownership is explicit and the value cleanup is handled by RAII. This removes the manual delete in certinfo_map_free and closes a leak window at the insert site: the old release()-then-insert dropped the pointer if the key already existed or the insert threw, whereas emplace with a move only transfers ownership once insertion succeeds. (cherry picked from commit 30d8fca)
cmcfarlen
pushed a commit
to cmcfarlen/trafficserver
that referenced
this pull request
Jul 29, 2026
) * ocsp: add single-cert stapling fast path and certinfo RAII Skip the SSL_get_certificate() lookup and X509_cmp() DER re-parse in the stapling callback when an SSL_CTX has a single certificate. The shortcut is gated to non-dual-cert builds; under HAVE_NATIVE_DUAL_CERT_SUPPORT a CTX can hold multiple certs where only one has OCSP info, so map size alone cannot identify the negotiated cert. Give certinfo a constructor/destructor so its resources are managed by RAII, and allocate it with make_unique. This consolidates the cleanup that was duplicated across certinfo_map_free and the init error path, and fixes two pre-existing leaks (cid and the BoringSSL cert ref) plus an error path that could delete a certinfo_map still owned by the SSL_CTX. * ocsp: make certinfo map own values via unique_ptr Switch the per-SSL_CTX certinfo map to store std::unique_ptr<certinfo> so ownership is explicit and the value cleanup is handled by RAII. This removes the manual delete in certinfo_map_free and closes a leak window at the insert site: the old release()-then-insert dropped the pointer if the key already existed or the insert threw, whereas emplace with a move only transfers ownership once insertion succeeds.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Skip the SSL_get_certificate() lookup and X509_cmp() DER re-parse in the stapling callback when an SSL_CTX has a single certificate. The shortcut is gated to non-dual-cert builds; under HAVE_NATIVE_DUAL_CERT_SUPPORT a CTX can hold multiple certs where only one has OCSP info, so map size alone cannot identify the negotiated cert.
Give certinfo a constructor/destructor so its resources are managed by RAII, and allocate it with make_unique. This consolidates the cleanup that was duplicated across certinfo_map_free and the init error path, and fixes two pre-existing leaks (cid and the BoringSSL cert ref) plus an error path that could delete a certinfo_map still owned by the SSL_CTX.