Add SSL_{CLIENT,SERVER}_B64CERT #177
Closed
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
michael-o
suggested changes
Mar 9, 2021
modules/ssl/ssl_engine_vars.c
Outdated
| @@ -71,6 +76,21 @@ static int ssl_is_https(conn_rec *c) | |||
| return sslconn && sslconn->ssl; | |||
| } | |||
|
|
|||
| #if APR_VERSION_AT_LEAST(1,7,0) | |||
| static const char *ssl_var_lookup_ssl_cert_b64url(apr_pool_t *p, X509 *xs) | |||
There was a problem hiding this comment.
The function name is wrong now.
There was a problem hiding this comment.
Thanks a lot for the review!
michael-o
suggested changes
Mar 11, 2021
| } | ||
| #if APR_VERSION_AT_LEAST(1,7,0) |
There was a problem hiding this comment.
Why does this still require APR 1.7.0+?
modules/ssl/ssl_engine_kernel.c
Outdated
|
|
||
| val = ssl_var_lookup(r->pool, r->server, r->connection, | ||
| r, "SSL_CLIENT_B64CERT"); | ||
| apr_table_setn(env, "SSL_CLIENT_B64CERT", val); |
There was a problem hiding this comment.
I still miss the entire chain for the sake of completeness.
| @@ -356,6 +356,7 @@ APLOG_USE_MODULE(ssl); | |||
| #define SSL_OPT_STRICTREQUIRE (1<<5) | |||
| #define SSL_OPT_OPTRENEGOTIATE (1<<6) | |||
| #define SSL_OPT_LEGACYDNFORMAT (1<<7) | |||
| #define SSL_OPT_EXPORTCB64DATA (1<<8) | |||
There was a problem hiding this comment.
Shouldn't this rather read SSL_OPT_EXPORTBASE64CERTDATA?
server/client cert.
PR: 65169
Switch to plain base64 encoding.
Add +ExportBase64CertData flag for SSLOptions to enable export of
SSL_{CLIENT,SERVER}_B64CERT.
Use plain base64 for the SSL_{SERVER,CLIENT}_B64CERT encoding.
michael-o
suggested changes
Mar 17, 2021
modules/ssl/ssl_engine_vars.c
Outdated
| @@ -477,7 +477,7 @@ static const char *ssl_var_lookup_ssl(apr_pool_t *p, const SSLConnRec *sslconn, | |||
| sk = SSL_get_peer_cert_chain(ssl); | |||
| result = ssl_var_lookup_ssl_cert_chain(p, sk, var+18, 1); | |||
| } | |||
| else if (ssl != NULL && strlen(var) > 18 && strcEQn(var, "CLIENT_B64CERT_CHAIN_", 18)) { | |||
| else if (ssl != NULL && strlen(var) > 21 && strcEQn(var, "CLIENT_B64CERT_CHAIN_", 21)) { | |||
| sk = SSL_get_peer_cert_chain(ssl); | |||
| result = ssl_var_lookup_ssl_cert_chain(p, sk, var+18, 0); | |||
There was a problem hiding this comment.
That would explain why it wasn't working properly. Thank you @michael-o
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.
Add SSL_{CLIENT,SERVER}_B64CERT to export the base64url(DER) of the server/client cert.
PR: 65169