From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Oct 2015 16:03:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f217b24e051af2046ff03cb64fd9345967e777dd;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.7'
---

f217b24e051af2046ff03cb64fd9345967e777dd
diff --cc src/common/tortls.c
index d8635675f8,536043e558..2a2a5d7fd1
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -2453,12 -2519,11 +2453,12 @@@ dn_indicates_v3_cert(X509_NAME *name
  
    str = X509_NAME_ENTRY_get_data(entry);
    len = ASN1_STRING_to_UTF8(&s, str);
 -  if (len < 0)
 +  if (len < 0) {
      return 0;
 +  }
    if (len < 4) {
      OPENSSL_free(s);
-     return 0;
+     return 1;
    }
    r = fast_memneq(s + len - 4, ".net", 4);
    OPENSSL_free(s);