[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
nickm at torproject.org
nickm at torproject.org
Wed Oct 21 16:03:11 UTC 2015
commit f217b24e051af2046ff03cb64fd9345967e777dd
Merge: 895a98d 4fb4906
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Oct 21 12:03:04 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.7'
src/common/tortls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc src/common/tortls.c
index d863567,536043e..2a2a5d7
--- 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);
More information about the tor-commits
mailing list