]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 16:03:04 +0000 (12:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 16:03:04 +0000 (12:03 -0400)
1  2 
src/common/tortls.c

index d8635675f8227cb2d0b8e7c024f70909f69e3b49,536043e558eb65a8d43ad8799ea403206820cfea..2a2a5d7fd1954a6654e550b78f246366f1dcf4f7
@@@ -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);