Init OpenSSL libctx and use it for pkey #18282
Open
+108
−18
Conversation
This file contains 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
| @@ -44,6 +44,16 @@ void php_openssl_backend_shutdown(void) | |||
| #endif | |||
| } | |||
|
|
|||
| EVP_PKEY_CTX *php_openssl_pkey_new_from_name(const char *name, int id) | |||
There was a problem hiding this comment.
To be fair, I think he had to for the sake of ssl apis inter-compatibility (look at the version for openssl 3.x), maybe just adding (void)name; should do.
| @@ -1487,6 +1487,37 @@ int php_openssl_get_evp_pkey_type(int key_type) { | |||
| } | |||
| } | |||
|
|
|||
| const char *php_openssl_get_evp_pkey_name(int key_type) { | |||
There was a problem hiding this comment.
Are there any drawbacks to making it static?
Comment on lines
+32
to
+48
| void php_openssl_backend_init_libctx(OSSL_LIB_CTX **plibctx, char **ppropq) | ||
| { | ||
| /* The return value is not checked because we cannot reasonable fail in GINIT so using NULL | ||
| * (default context) is probably better. */ | ||
| *plibctx = OSSL_LIB_CTX_new(); | ||
| *ppropq = NULL; | ||
| } | ||
|
|
||
| void php_openssl_backend_destroy_libctx(OSSL_LIB_CTX *libctx, char *propq) | ||
| { | ||
| if (libctx != NULL) { | ||
| OSSL_LIB_CTX_free(libctx); | ||
| } | ||
| if (propq != NULL) { | ||
| free(propq); | ||
| } | ||
| } |
There was a problem hiding this comment.
Is it okay to omit #if PHP_OPENSSL_API_VERSION >= 0x30000?
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 adds initial setup for libctx and make use of it in PKEY handling.