mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.5' into maint-0.2.6

Browse source
This commit is contained in:
Nick Mathewson 2017-02-07 08:39:07 -05:00
commit 8936c50d83
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changes/bug17404 Normal file
View file

@ -0,0 +1,6 @@
o Major bugfixes (security, correctness):
- Fix a programming error that could cause us to read 4 bytes before
the beginning of an openssl string. This could be used to provoke
a crash on systems with an unusual malloc implementation, or
systems with unsual hardening installed. Fixes bug 17404; bugfix
on 0.2.3.6-alpha.

4
src/common/tortls.c
View file

@ -2739,6 +2739,10 @@ dn_indicates_v3_cert(X509_NAME *name)
len = ASN1_STRING_to_UTF8(&s, str); len = ASN1_STRING_to_UTF8(&s, str);
if (len < 0) if (len < 0)
return 0; return 0;
if (len < 4) {
OPENSSL_free(s);
return 1;
}
r = fast_memneq(s + len - 4, ".net", 4); r = fast_memneq(s + len - 4, ".net", 4);
OPENSSL_free(s); OPENSSL_free(s);
return r; return r;