aboutsummaryrefslogtreecommitdiff
path: root/src/common/tortls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-21 11:53:00 -0400
committerNick Mathewson <nickm@torproject.org>2015-10-21 11:53:00 -0400
commit895a98dbaf9619c8a24ef872bfeca84a764a6ccb (patch)
treea58dfa635d16841bdacc4c89a56c4d3e2e9540df /src/common/tortls.c
parent52fd384a465ba91762bc4f71d239ed1e5150f947 (diff)
parentb809c265e77f4528b59aa3932a3cde8bf5e19fb3 (diff)
downloadtor-895a98dbaf9619c8a24ef872bfeca84a764a6ccb.tar.gz
tor-895a98dbaf9619c8a24ef872bfeca84a764a6ccb.zip
Merge remote-tracking branch 'origin/maint-0.2.7'
Diffstat (limited to 'src/common/tortls.c')
-rw-r--r--src/common/tortls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 156750853e..d8635675f8 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -2456,6 +2456,10 @@ dn_indicates_v3_cert(X509_NAME *name)
if (len < 0) {
return 0;
}
+ if (len < 4) {
+ OPENSSL_free(s);
+ return 0;
+ }
r = fast_memneq(s + len - 4, ".net", 4);
OPENSSL_free(s);
return r;