Skip to content

Commit

Permalink
tls_wolfssl: clang-format
Browse files Browse the repository at this point in the history 
(cherry-pick from 0f963a7)
  • Loading branch information
@space88man
space88man committed Jan 30, 2024
1 parent 2e6e879 commit 07afe1b
Show file tree
Hide file tree
Showing 5 changed files with 352 additions and 352 deletions.
30 changes: 14 additions & 16 deletions src/modules/tls_wolfssl/tls_domain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@ tls_domain_t *tls_new_domain(int type, struct ip_addr *ip, unsigned short port)
*/
void tls_free_domain(tls_domain_t *d)
{
if(!d)
if(!d)
return;
if(d->ctx) {
do {
if(d->ctx[0])
wolfSSL_CTX_free(d->ctx[0]);
}while(0);
} while(0);
shm_free(d->ctx);
}

Expand Down Expand Up @@ -375,7 +375,7 @@ static int tls_domain_foreach_CTX(
do {
if((ret = ctx_cbk(d->ctx[0], l1, p2)) < 0)
return ret;
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -523,7 +523,7 @@ static int load_cert(tls_domain_t *d)
TLS_ERR("load_cert:");
return -1;
}
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -566,7 +566,7 @@ static int load_ca_list(tls_domain_t *d)
return -1;
}
}
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -600,7 +600,7 @@ static int load_crl(tls_domain_t *d)
store = wolfSSL_CTX_get_cert_store(d->ctx[0]);
wolfSSL_X509_STORE_set_flags(
store, WOLFSSL_CRL_CHECK | WOLFSSL_CRL_CHECKALL);
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -631,7 +631,7 @@ static int set_cipher_list(tls_domain_t *d)
return -1;
}
setup_dh(d->ctx[0]);
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -685,7 +685,7 @@ static int set_verification(tls_domain_t *d)
wolfSSL_CTX_set_verify(d->ctx[0], verify_mode, 0);
}
wolfSSL_CTX_set_verify_depth(d->ctx[0], d->verify_depth);
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -736,7 +736,7 @@ static int set_ssl_options(tls_domain_t *d)
wolfSSL_CTX_set_options(d->ctx[0], options);
if(sr_tls_renegotiation == 0)
wolfSSL_CTX_set_info_callback(d->ctx[0], sr_ssl_ctx_info_callback);
}while(0);
} while(0);
return 0;
}

Expand All @@ -762,7 +762,7 @@ static int set_session_cache(tls_domain_t *d)
/* not really needed is SSL_SESS_CACHE_OFF */
wolfSSL_CTX_set_session_id_context(d->ctx[0],
(unsigned char *)tls_session_id.s, tls_session_id.len);
}while(0);
} while(0);
return 0;
}

Expand Down Expand Up @@ -839,8 +839,7 @@ static int tls_server_name_cb(SSL *ssl, int *ad, void *private)
str server_name;

orig_domain = (tls_domain_t *)private;
server_name.s =
(char *)wolfSSL_get_servername(ssl, WOLFSSL_SNI_HOST_NAME);
server_name.s = (char *)wolfSSL_get_servername(ssl, WOLFSSL_SNI_HOST_NAME);
if(server_name.s) {
LM_DBG("received server_name (TLS extension): '%s'\n", server_name.s);
} else {
Expand All @@ -866,8 +865,7 @@ static int tls_server_name_cb(SSL *ssl, int *ad, void *private)
" socket [%s:%d] server name='%s' -"
" switching SSL CTX to %p dom %p%s\n",
server_name.s, ip_addr2a(&new_domain->ip), new_domain->port,
ZSW(new_domain->server_name.s), new_domain->ctx[0],
new_domain,
ZSW(new_domain->server_name.s), new_domain->ctx[0], new_domain,
(new_domain->type & TLS_DOMAIN_DEF) ? " (default)" : "");
wolfSSL_set_SSL_CTX(ssl, new_domain->ctx[0]);
/* SSL_set_SSL_CTX only sets the correct certificate parameters, but does
Expand Down Expand Up @@ -959,7 +957,7 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def)
return -1;
}
}
}while(0);
} while(0);

if((d->type & TLS_DOMAIN_SRV)
&& (d->server_name.len > 0 || (d->type & TLS_DOMAIN_DEF))) {
Expand Down Expand Up @@ -1029,7 +1027,7 @@ static int load_private_key(tls_domain_t *d)
TLS_ERR("load_private_key:");
return -1;
}
}while(0);
} while(0);

DBG("%s: Key '%s' successfully loaded\n", tls_domain_str(d),
d->pkey_file.s);
Expand Down
57 changes: 28 additions & 29 deletions src/modules/tls_wolfssl/tls_rpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ static void tls_list(rpc_t *rpc, void *c)
lock_release(&con->write_lock);
} else {
rpc->struct_add(handle, "sdds", "cipher", "unknown",
"ct_wq_size", 0, "flags", 0, "state",
"pre-init");
"ct_wq_size", 0, "flags", 0, "state", "pre-init");
}
}
}
Expand Down Expand Up @@ -223,33 +222,33 @@ static void tls_options(rpc_t *rpc, void *c)
{
void *handle;
rpc->add(c, "{", &handle);
rpc->struct_add(
handle, "dSdddSSSSSdSSdddddddddddd",
"force_run", cfg_get(tls, tls_cfg, force_run),
"method", &cfg_get(tls, tls_cfg, method),
"verify_certificate", cfg_get(tls, tls_cfg, verify_cert),
"verify_depth", cfg_get(tls, tls_cfg, verify_depth),
"require_certificate", cfg_get(tls, tls_cfg, require_cert),
"verify_client", &cfg_get(tls, tls_cfg, verify_client),
"private_key", &cfg_get(tls, tls_cfg, private_key),
"ca_list", &cfg_get(tls, tls_cfg, ca_list),
"certificate", &cfg_get(tls, tls_cfg, certificate),
"cipher_list", &cfg_get(tls, tls_cfg, cipher_list),
"session_cache", cfg_get(tls, tls_cfg, session_cache),
"session_id", &cfg_get(tls, tls_cfg, session_id),
"config", &cfg_get(tls, tls_cfg, config_file),
"log", cfg_get(tls, tls_cfg, log),
"debug", cfg_get(tls, tls_cfg, debug),
"connection_timeout", TICKS_TO_S(cfg_get(tls, tls_cfg, con_lifetime)),
"disable_compression", cfg_get(tls, tls_cfg, disable_compression),
"ssl_release_buffers", cfg_get(tls, tls_cfg, ssl_release_buffers),
"ssl_freelist_max", cfg_get(tls, tls_cfg, ssl_freelist_max),
"ssl_max_send_fragment", cfg_get(tls, tls_cfg, ssl_max_send_fragment),
"ssl_read_ahead", cfg_get(tls, tls_cfg, ssl_read_ahead),
"send_close_notify", cfg_get(tls, tls_cfg, send_close_notify),
"ct_wq_max", cfg_get(tls, tls_cfg, ct_wq_max),
"con_ct_wq_max", cfg_get(tls, tls_cfg, con_ct_wq_max),
"ct_wq_blk_size", cfg_get(tls, tls_cfg, ct_wq_blk_size));
rpc->struct_add(handle, "dSdddSSSSSdSSdddddddddddd", "force_run",
cfg_get(tls, tls_cfg, force_run), "method",
&cfg_get(tls, tls_cfg, method), "verify_certificate",
cfg_get(tls, tls_cfg, verify_cert), "verify_depth",
cfg_get(tls, tls_cfg, verify_depth), "require_certificate",
cfg_get(tls, tls_cfg, require_cert), "verify_client",
&cfg_get(tls, tls_cfg, verify_client), "private_key",
&cfg_get(tls, tls_cfg, private_key), "ca_list",
&cfg_get(tls, tls_cfg, ca_list), "certificate",
&cfg_get(tls, tls_cfg, certificate), "cipher_list",
&cfg_get(tls, tls_cfg, cipher_list), "session_cache",
cfg_get(tls, tls_cfg, session_cache), "session_id",
&cfg_get(tls, tls_cfg, session_id), "config",
&cfg_get(tls, tls_cfg, config_file), "log",
cfg_get(tls, tls_cfg, log), "debug", cfg_get(tls, tls_cfg, debug),
"connection_timeout",
TICKS_TO_S(cfg_get(tls, tls_cfg, con_lifetime)),
"disable_compression", cfg_get(tls, tls_cfg, disable_compression),
"ssl_release_buffers", cfg_get(tls, tls_cfg, ssl_release_buffers),
"ssl_freelist_max", cfg_get(tls, tls_cfg, ssl_freelist_max),
"ssl_max_send_fragment",
cfg_get(tls, tls_cfg, ssl_max_send_fragment), "ssl_read_ahead",
cfg_get(tls, tls_cfg, ssl_read_ahead), "send_close_notify",
cfg_get(tls, tls_cfg, send_close_notify), "ct_wq_max",
cfg_get(tls, tls_cfg, ct_wq_max), "con_ct_wq_max",
cfg_get(tls, tls_cfg, con_ct_wq_max), "ct_wq_blk_size",
cfg_get(tls, tls_cfg, ct_wq_blk_size));
}


Expand Down
11 changes: 6 additions & 5 deletions src/modules/tls_wolfssl/tls_select.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ static SSL *get_ssl(struct tcp_connection *c)
}


static int get_cert(
WOLFSSL_X509 **cert, struct tcp_connection **c, struct sip_msg *msg, int my)
static int get_cert(WOLFSSL_X509 **cert, struct tcp_connection **c,
struct sip_msg *msg, int my)
{
WOLFSSL *ssl;

Expand Down Expand Up @@ -918,8 +918,8 @@ static int pv_ssl_cert(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)


/* NB: SSL_get0_verified_chain() was introduced in OpenSSL 1.1.0 */
static int get_verified_cert_chain(
WOLF_STACK_OF(WOLFSSL_X509) * *chain, struct tcp_connection **c, struct sip_msg *msg)
static int get_verified_cert_chain(WOLF_STACK_OF(WOLFSSL_X509) * *chain,
struct tcp_connection **c, struct sip_msg *msg)
{
SSL *ssl;

Expand Down Expand Up @@ -1003,7 +1003,8 @@ static int get_comp(str *res, int local, int issuer, int nid, sip_msg_t *msg)
if(get_cert(&cert, &c, msg, local) < 0)
return -1;

name = issuer ? wolfSSL_X509_get_issuer_name(cert) : wolfSSL_X509_get_subject_name(cert);
name = issuer ? wolfSSL_X509_get_issuer_name(cert)
: wolfSSL_X509_get_subject_name(cert);
if(!name) {
ERR("Cannot extract subject or issuer name from peer certificate\n");
goto err;
Expand Down

0 comments on commit 07afe1b

Please sign in to comment.