Fixed some mixed declarations-and-code.

diff --git a/src/ChangeLog b/src/ChangeLog
index e13f6589a963ff03b998e4f19bb89c9938d753b1..76ad7e40e76a20a818477ea1bdf3594ce23e8049 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-13  Micah Cowan  <micah@cowan.name>
+
+       * openssl.c: Fixed some mixed declarations-and-code.
+
 2010-01-09  Micah Cowan  <micah@cowan.name>
 
        * init.c, main.c, http.c, ftp.c, options.h: Renamed

diff --git a/src/openssl.c b/src/openssl.c
index 4eef5c6c49c82efa3510da3ce6c005cd50068d0c..1823f5935655a15a4b8d92279a9cb5129acb63c2 100644 (file)
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -576,8 +576,7 @@ ssl_check_certificate (int fd, const char *host)
 
       /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)?
        * Signal it by host_in_octet_string. */
-      ASN1_OCTET_STRING *host_in_octet_string = NULL;
-      host_in_octet_string = a2i_IPADDRESS (host);
+      ASN1_OCTET_STRING *host_in_octet_string = a2i_IPADDRESS (host);
 
       int numaltnames = sk_GENERAL_NAME_num (subjectAltNames);
       int i;
@@ -602,11 +601,13 @@ ssl_check_certificate (int fd, const char *host)
                 }
               else if (name->type == GEN_DNS)
                 {
-                  /* Check for dNSName */
-                  alt_name_checked = true;
                   /* dNSName should be IA5String (i.e. ASCII), however who
                    * does trust CA? Convert it into UTF-8 for sure. */
                   unsigned char *name_in_utf8 = NULL;
+
+                  /* Check for dNSName */
+                  alt_name_checked = true;
+
                   if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName))
                     {
                       /* Compare and check for NULL attack in ASN1_STRING */