Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/conn.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,12 +737,14 @@ _makeTLSConn(natsConnection *nc)
}
if (s == NATS_OK)
{
SSL_verify_cb cb = _collectSSLErr;
#ifdef NATS_WITH_EXPERIMENTAL
SSL_verify_cb cb = _collectSSLErr;
if (nc->opts->sslCtx->callback != NULL)
cb = nc->opts->sslCtx->callback;
#endif // NATS_WITH_EXPERIMENTAL
SSL_set_verify(ssl, SSL_VERIFY_PEER, cb);
#else
SSL_set_verify(ssl, SSL_VERIFY_PEER, _collectSSLErr);
#endif // NATS_WITH_EXPERIMENTAL
}
}
}
Expand Down Expand Up @@ -3360,7 +3362,7 @@ _processUrlString(natsOptions *opts, const char *urls)
serverUrls = (char**) NATS_CALLOC(count + 1, sizeof(char*));
if (serverUrls == NULL)
return NATS_NO_MEMORY;

if (s == NATS_OK)
{
urlsCopy = NATS_STRDUP(urls);
Expand Down