summaryrefslogtreecommitdiff
path: root/src/cli.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cli.c')
-rw-r--r--src/cli.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/cli.c b/src/cli.c
index 42b8e51324..21be015dc8 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -331,9 +331,10 @@ static int cert_verify_callback(gnutls_session_t session)
ssh = strictssh;
}
- if (HAVE_OPT(VERIFY_HOSTNAME))
+ if (HAVE_OPT(VERIFY_HOSTNAME)) {
host = OPT_ARG(VERIFY_HOSTNAME);
- else
+ canonicalize_host((char *) host, NULL, 0);
+ } else
host = hostname;
/* Save certificate and OCSP response */
@@ -603,8 +604,10 @@ gnutls_session_t init_tls_session(const char *host)
*/
if (disable_extensions == 0 && disable_sni == 0) {
if (HAVE_OPT(SNI_HOSTNAME)) {
- gnutls_server_name_set(session, GNUTLS_NAME_DNS,
- OPT_ARG(SNI_HOSTNAME), strlen(OPT_ARG(SNI_HOSTNAME)));
+ const char *sni_host = OPT_ARG(SNI_HOSTNAME);
+
+ canonicalize_host((char *) sni_host, NULL, 0);
+ gnutls_server_name_set(session, GNUTLS_NAME_DNS, sni_host, strlen(sni_host));
} else if (host != NULL && is_ip(host) == 0)
gnutls_server_name_set(session, GNUTLS_NAME_DNS,
host, strlen(host));