aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental/tls/mbedtls
diff options
context:
space:
mode:
Diffstat (limited to 'src/supplemental/tls/mbedtls')
-rw-r--r--src/supplemental/tls/mbedtls/mbedtls.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/supplemental/tls/mbedtls/mbedtls.c b/src/supplemental/tls/mbedtls/mbedtls.c
index 8250740f..57c0a7bf 100644
--- a/src/supplemental/tls/mbedtls/mbedtls.c
+++ b/src/supplemental/tls/mbedtls/mbedtls.c
@@ -290,9 +290,7 @@ conn_init(nng_tls_engine_conn *ec, void *tls, nng_tls_engine_config *cfg,
return (tls_mk_err(rv));
}
- if (cfg->server_name != NULL) {
- mbedtls_ssl_set_hostname(&ec->ctx, cfg->server_name);
- }
+ mbedtls_ssl_set_hostname(&ec->ctx, cfg->server_name);
if (cfg->mode == NNG_TLS_MODE_SERVER) {
nng_str_sockaddr(sa, buf, sizeof(buf));
@@ -538,8 +536,8 @@ config_init(nng_tls_engine_config *cfg, enum nng_tls_mode mode)
static int
config_server_name(nng_tls_engine_config *cfg, const char *name)
{
- char *dup;
- if ((dup = nni_strdup(name)) == NULL) {
+ char *dup = NULL;
+ if (name != NULL && ((dup = nni_strdup(name)) == NULL)) {
return (NNG_ENOMEM);
}
if (cfg->server_name != NULL) {