diff options
| author |   djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-11-03 02:34:28 +0000 |
| commit | c32db552feb5310e2f4b27f02d313cfbf0b82a8a (patch) | |
| tree | b7b6074be11e20dcb5106c8a27f96bcb3fcdf5c2 /lib/libssl/src/ssl/s3_lib.c | |
| parent | import OpenSSL 1.0.0e (diff) | |
| download | wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.tar.xz wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libssl/src/ssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index d6b047c9955..62c791cb724 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/lib/libssl/src/ssl/s3_lib.c @@ -2198,11 +2198,17 @@ void ssl3_clear(SSL *s) } #ifndef OPENSSL_NO_DH if (s->s3->tmp.dh != NULL) + { DH_free(s->s3->tmp.dh); + s->s3->tmp.dh = NULL; + } #endif #ifndef OPENSSL_NO_ECDH if (s->s3->tmp.ecdh != NULL) + { EC_KEY_free(s->s3->tmp.ecdh); + s->s3->tmp.ecdh = NULL; + } #endif rp = s->s3->rbuf.buf; |