diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:56:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:56:37 -0500 |
| commit | 912b76a1bf2645e74fbca8ba3f27f1a17d510cf5 (patch) | |
| tree | 23b28ce94beb1048fc48c3bd50f5ff4a3db8bb8e /src/common/tortls.c | |
| parent | 0fcb677e8a33462a22500efe2ab528c5be60bff9 (diff) | |
| parent | 2fa9ddb9580fc0d69967c54f16825f14658fd9b9 (diff) | |
| download | tor-912b76a1bf2645e74fbca8ba3f27f1a17d510cf5.tar.gz tor-912b76a1bf2645e74fbca8ba3f27f1a17d510cf5.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 6d38b5532f..ca9e92c8e9 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -829,6 +829,7 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime) goto error; { crypto_dh_env_t *dh = crypto_dh_new(DH_TYPE_TLS); + tor_assert(dh); SSL_CTX_set_tmp_dh(result->ctx, _crypto_dh_env_get_dh(dh)); crypto_dh_free(dh); } |