generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix no-ec

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-12-24 00:23:29 +00:00
parent e2b420fdd7
commit b22d71131a
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/s3_lib.c
View File

@@ -3375,17 +3375,11 @@ void ssl3_free(SSL *s)
ssl3_cleanup_key_block(s); ssl3_cleanup_key_block(s);
#ifndef OPENSSL_NO_DH
DH_free(s->s3->tmp.dh);
#endif
#ifndef OPENSSL_NO_EC
EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL;
#endif
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(s->s3->peer_tmp); EVP_PKEY_free(s->s3->peer_tmp);
s->s3->peer_tmp = NULL; s->s3->peer_tmp = NULL;
EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL;
#endif #endif
sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free); sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
@@ -3413,16 +3407,12 @@ void ssl3_clear(SSL *s)
OPENSSL_free(s->s3->tmp.peer_sigalgs); OPENSSL_free(s->s3->tmp.peer_sigalgs);
s->s3->tmp.peer_sigalgs = NULL; s->s3->tmp.peer_sigalgs = NULL;
#ifndef OPENSSL_NO_DH
DH_free(s->s3->tmp.dh);
s->s3->tmp.dh = NULL;
#endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL;
s->s3->is_probably_safari = 0; s->s3->is_probably_safari = 0;
#endif #endif
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL;
EVP_PKEY_free(s->s3->peer_tmp); EVP_PKEY_free(s->s3->peer_tmp);
s->s3->peer_tmp = NULL; s->s3->peer_tmp = NULL;
#endif /* !OPENSSL_NO_EC */ #endif /* !OPENSSL_NO_EC */

7
ssl/ssl_locl.h
View File

@@ -1227,11 +1227,8 @@ typedef struct ssl3_state_st {
int message_type; int message_type;
/* used to hold the new cipher we are going to use */ /* used to hold the new cipher we are going to use */
const SSL_CIPHER *new_cipher; const SSL_CIPHER *new_cipher;
# ifndef OPENSSL_NO_DH # if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
DH *dh; EVP_PKEY *pkey; /* holds short lived DH/ECDH key */
# endif
# ifndef OPENSSL_NO_EC
EVP_PKEY *pkey; /* holds short lived ECDH key */
# endif # endif
/* used for certificate requests */ /* used for certificate requests */
int cert_req; int cert_req;

4
ssl/statem/statem_srvr.c
View File

@@ -2127,7 +2127,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
RSA *rsa = NULL; RSA *rsa = NULL;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
#endif #endif
#ifndef OPENSSL_NO_EC #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY *ckey = NULL; EVP_PKEY *ckey = NULL;
#endif #endif
PACKET enc_premaster; PACKET enc_premaster;
@@ -2616,7 +2616,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_EC) || defined(OPENSSL_NO_SRP) #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_EC) || defined(OPENSSL_NO_SRP)
err: err:
#endif #endif
#ifndef OPENSSL_NO_EC #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(ckey); EVP_PKEY_free(ckey);
#endif #endif
OPENSSL_free(rsa_decrypt); OPENSSL_free(rsa_decrypt);