Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow enabling of TLS verification without supplying CRL file #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wdoekes merged 4 commits into from
Jan 26, 2024
Merged

Allow enabling of TLS verification without supplying CRL file #663

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d419961
Allow enabling of TLS verification without supplying CRL file
IvanRibakov Oct 17, 2023
975e977
Update verify_callback with additional debug info
IvanRibakov Oct 26, 2023
e20c7c0
Merge pull request #2 from IvanRibakov/feature/tls_verification_dbg
IvanRibakov Oct 26, 2023
6653ea9
Fix camelCase variables
IvanRibakov Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions src/sslsocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,22 @@ SSL* SSL_new_server()
static int sip_tls_verify_callback(int ok , X509_STORE_CTX *store)
{
char data[512];
int err, depth;
X509 *cert;

if (!ok) {
X509 *cert = X509_STORE_CTX_get_current_cert(store);
cert = X509_STORE_CTX_get_current_cert(store);
err = X509_STORE_CTX_get_error(store);
depth = X509_STORE_CTX_get_error_depth(store);

X509_NAME_oneline(X509_get_issuer_name(cert),
data, 512);
WARNING("TLS verification error for issuer: '%s'", data);
WARNING("TLS verification error for issuer: '%s'\n", data);
X509_NAME_oneline(X509_get_subject_name(cert),
data, 512);
WARNING("TLS verification error for subject: '%s'", data);
WARNING("TLS verification error for subject: '%s'\n", data);
WARNING("verify error:num=%d:%s:depth=%d\n", err,
X509_verify_cert_error_string(err), depth);
}
return ok;
}
Expand Down Expand Up @@ -290,24 +296,30 @@ enum tls_init_status TLS_init_context(void)
return TLS_INIT_ERROR;
}

bool got_ca_file = strlen(tls_ca_name) != 0;
bool got_crl_file = strlen(tls_crl_name) != 0;

/* Load the trusted CA's */
if (strlen(tls_ca_name) != 0) {
if (got_ca_file) {
SSL_CTX_load_verify_locations(sip_trp_ssl_ctx, tls_ca_name, NULL);
SSL_CTX_load_verify_locations(sip_trp_ssl_ctx_client, tls_ca_name, NULL);
}

/* TLS Verification only makes sense if an CA is specified or
* we require CRL validation. */
if (strlen(tls_ca_name) != 0 || strlen(tls_crl_name) != 0) {
if (sip_tls_load_crls(sip_trp_ssl_ctx, tls_crl_name) == -1) {
ERROR("TLS_init_context: Unable to load CRL file (%s)", tls_crl_name);
return TLS_INIT_ERROR;
}

if (sip_tls_load_crls(sip_trp_ssl_ctx_client, tls_crl_name) == -1) {
ERROR("TLS_init_context: Unable to load CRL (client) file (%s)",
tls_crl_name);
return TLS_INIT_ERROR;

if (got_ca_file || got_crl_file) {
if (got_crl_file) {
if (sip_tls_load_crls(sip_trp_ssl_ctx, tls_crl_name) == -1) {
ERROR("TLS_init_context: Unable to load CRL file (%s)", tls_crl_name);
return TLS_INIT_ERROR;
}

if (sip_tls_load_crls(sip_trp_ssl_ctx_client, tls_crl_name) == -1) {
ERROR("TLS_init_context: Unable to load CRL (client) file (%s)",
tls_crl_name);
return TLS_INIT_ERROR;
}
}
/* The following call forces to process the certificates with
* the initialised SSL_CTX */
Expand Down