sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.1' into release-0.2.1

This commit is contained in:
Nick Mathewson 2011-12-14 16:06:03 -05:00
parent e234c1cd23 ff2c9acbb3
commit 67357ca9f3
5 changed files with 9617 additions and 5216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug4410 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Correctly sanity-check that we don't underflow on a memory allocation
for introduction point decryption. Bug discovered by Dan Rosenberg.
Fixes bug 4410; bugfix on 0.2.1.5-alpha.

3
changes/geoip-december2011 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update to the December 6 2011 Maxmind GeoLite Country database.

3
changes/geoip-november2011 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update to the November 1 2011 Maxmind GeoLite Country database.

14817
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

5
src/or/routerparse.c
View File

@ -3858,6 +3858,11 @@ rend_decrypt_introduction_points(char **ipos_decrypted,
crypto_cipher_env_t *cipher;
char *dec;
int declen;
if (ipos_encrypted_size < CIPHER_IV_LEN + 2) {
log_warn(LD_REND, "Size of encrypted introduction points is too "
"small.");
return -1;
}
dec = tor_malloc_zero(ipos_encrypted_size - CIPHER_IV_LEN - 1);
cipher = crypto_create_init_cipher(descriptor_cookie, 0);
declen = crypto_cipher_decrypt_with_iv(cipher, dec,