Commit d7fb8a34 authored Jan 14, 2008 by Nick Mathewson

r17613@catbus: nickm | 2008-01-14 13:52:44 -0500

 Do not segfault if symetric key generation somehow fails in crypto_hybrid_encrypt.


svn:r13132

parent 581ba51c

ChangeLog

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
		- Make bridges round geoip info up, not down.
		- Avoid a spurious free on base64 failure. Bugfix on 0.1.2.
		- Detect more kinds of possible internal error.
		- Avoid possible segfault if key generation fails in
		crypto_pk_hybrid_encrypt. Bugfix on 0.2.0.

		o Minor features (controller):
		- Get NS events working again. (Patch from tup)

src/common/crypto.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -858,8 +858,10 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
		crypto_free_cipher_env(cipher);
		return outlen + symlen;
		err:
		if (buf) {
		memset(buf, 0, pkeylen);
		tor_free(buf);
		}
		if (cipher) crypto_free_cipher_env(cipher);
		return -1;
		}