Introduce OpenSSL INI for selecting libctx #18768
Open
+103
−32
Conversation
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
Girgias
reviewed
Jun 5, 2025
Comment on lines
+356
to
+376
| #if PHP_OPENSSL_API_VERSION >= 0x30000 | ||
| const char *name = ZSTR_VAL(new_value); | ||
|
|
||
| if (!strcmp(name, "default")) { | ||
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).default_libctx; | ||
| } else if (!strcmp(name, "custom")) { | ||
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).custom_libctx; | ||
| } else { | ||
| int err_type; | ||
| if (stage == ZEND_INI_STAGE_RUNTIME) { | ||
| err_type = E_WARNING; | ||
| } else { | ||
| err_type = E_ERROR; | ||
| } | ||
|
|
||
| /* Do not output error when restoring ini options. */ | ||
| if (stage != ZEND_INI_STAGE_DEACTIVATE) { | ||
| php_error_docref(NULL, err_type, "OpenSSL libctx \"%s\" cannot be found", name); | ||
| } | ||
| return FAILURE; | ||
| } |
There was a problem hiding this comment.
You can just use the zend_string APIs which are clearer, and can also do some pointer comparisons if the strings are interned for any reason.
Suggested change
| #if PHP_OPENSSL_API_VERSION >= 0x30000 | |
| const char *name = ZSTR_VAL(new_value); | |
| if (!strcmp(name, "default")) { | |
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).default_libctx; | |
| } else if (!strcmp(name, "custom")) { | |
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).custom_libctx; | |
| } else { | |
| int err_type; | |
| if (stage == ZEND_INI_STAGE_RUNTIME) { | |
| err_type = E_WARNING; | |
| } else { | |
| err_type = E_ERROR; | |
| } | |
| /* Do not output error when restoring ini options. */ | |
| if (stage != ZEND_INI_STAGE_DEACTIVATE) { | |
| php_error_docref(NULL, err_type, "OpenSSL libctx \"%s\" cannot be found", name); | |
| } | |
| return FAILURE; | |
| } | |
| #if PHP_OPENSSL_API_VERSION >= 0x30000 | |
| if (zend_string_equals(new_value, "default")) { | |
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).default_libctx; | |
| } else if (zend_string_equals(new_value, "custom")) { | |
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).custom_libctx; | |
| } else { | |
| int err_type; | |
| if (stage == ZEND_INI_STAGE_RUNTIME) { | |
| err_type = E_WARNING; | |
| } else { | |
| err_type = E_ERROR; | |
| } | |
| /* Do not output error when restoring ini options. */ | |
| if (stage != ZEND_INI_STAGE_DEACTIVATE) { | |
| php_error_docref(NULL, err_type, "OpenSSL libctx \"%s\" cannot be found", ZSTR_VAL(new_value)); | |
| } | |
| return FAILURE; | |
| } |
| } else if (!strcmp(name, "custom")) { | ||
| OPENSSL_G(ctx).libctx = OPENSSL_G(ctx).custom_libctx; | ||
| } else { | ||
| int err_type; |
There was a problem hiding this comment.
Is this used only when stage != ZEND_INI_STAGE_DEACTIVATE?
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.
This introduces a new INI that will allow fallback to default ctx. The plan is to actually initially use custom libctx only on ZTS by default and keep the default one for non-zts. The reason why it's not done in this PR is to allow CI to test the custom libctx.
In addition custom libctx now loads the config and also legacy provider if
LOAD_OPENSSL_LEGACY_PROVIDERdefined.There's been some minor init / globals refactoring done as well.