openssl-1.0.0e: resolve conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index d6b047c995..62c791cb72 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/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;