Do not call gnutls_x509_crt_check_hostname() if hostname eq NULL. Reported by Matthew Hall.

2 files changed, 13 insertions, 9 deletions

diff --git a/THANKS b/THANKS
index 32d6bc4de1..123c733709 100644
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@ Joseph Graham                   *joe [at] t67.eu*
 Eli Zaretskii                   *eliz [at] gnu.org*
 Patrick Pelletier               *code [at] funwithsoftware.org*
 Sean Buckheister                *s_buckhe [at] cs.uni-kl.de*
+Matthew Hall                    *mhall [at] mhcomputing.net*
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/src/common.c b/src/common.c
index 65e9c721b7..48f56bdcc7 100644
--- a/src/common.c
+++ b/src/common.c
@@ -218,18 +218,21 @@ verify_x509_hostname (gnutls_session_t session, const char *hostname)
   /* Check the hostname of the first certificate if it matches
    * the name of the host we connected to.
    */
-  if (gnutls_x509_crt_check_hostname (crt, hostname) == 0)
+  if (hostname != NULL)
     {
-      printf
+      if (gnutls_x509_crt_check_hostname (crt, hostname) == 0)
+        {
+          printf
              ("- The hostname in the certificate does NOT match '%s'\n",
               hostname);
-      ret = 0;
-    }
-  else
-    {
-      printf ("- The hostname in the certificate matches '%s'.\n",
-              hostname);
-      ret = 1;
+          ret = 0;
+        }
+      else
+        {
+          printf ("- The hostname in the certificate matches '%s'.\n",
+                  hostname);
+          ret = 1;
+        }
     }
 
   gnutls_x509_crt_deinit (crt);