summaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-12-13 13:41:32 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-12-16 14:17:53 +0000
commit880d9d8609506e27e2031cc1a96663380ab70da5 (patch)
treea3b5b143019d6c03d12d1dd1896fbd5ec00a91c1 /ssl/s3_lib.c
parent3f3504bdaf4f43971a1e584b566d7a5281a33c43 (diff)
Use EVP_PKEY for server EC.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 4585c9ef0a..ddb7ed4204 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3760,7 +3760,8 @@ void ssl3_free(SSL *s)
DH_free(s->s3->peer_dh_tmp);
#endif
#ifndef OPENSSL_NO_EC
- EC_KEY_free(s->s3->tmp.ecdh);
+ EVP_PKEY_free(s->s3->tmp.pkey);
+ s->s3->tmp.pkey = NULL;
EC_KEY_free(s->s3->peer_ecdh_tmp);
#endif
@@ -3798,8 +3799,8 @@ void ssl3_clear(SSL *s)
s->s3->peer_dh_tmp = NULL;
#endif
#ifndef OPENSSL_NO_EC
- EC_KEY_free(s->s3->tmp.ecdh);
- s->s3->tmp.ecdh = NULL;
+ EVP_PKEY_free(s->s3->tmp.pkey);
+ s->s3->tmp.pkey = NULL;
EC_KEY_free(s->s3->peer_ecdh_tmp);
s->s3->peer_ecdh_tmp = NULL;
s->s3->is_probably_safari = 0;