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

OPENSSL_NO_EC* merge; missed one file

Browse Source 
Missed one file in the #ifdef merge; thanks Kurt.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
This commit is contained in:
Rich Salz 2015-03-15 14:49:15 -04:00
parent eef53ee50b
commit 556efe7961
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/s3_srvr.c
View File

@ -1968,7 +1968,7 @@ int ssl3_send_server_key_exchange(SSL *s)
f_err: f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al); ssl3_send_alert(s, SSL3_AL_FATAL, al);
err: err:
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_EC
if (encodedPoint != NULL) if (encodedPoint != NULL)
OPENSSL_free(encodedPoint); OPENSSL_free(encodedPoint);
BN_CTX_free(bn_ctx); BN_CTX_free(bn_ctx);
@ -2066,7 +2066,7 @@ int ssl3_get_client_key_exchange(SSL *s)
KSSL_ERR kssl_err; KSSL_ERR kssl_err;
#endif /* OPENSSL_NO_KRB5 */ #endif /* OPENSSL_NO_KRB5 */
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_EC
EC_KEY *srvr_ecdh = NULL; EC_KEY *srvr_ecdh = NULL;
EVP_PKEY *clnt_pub_pkey = NULL; EVP_PKEY *clnt_pub_pkey = NULL;
EC_POINT *clnt_ecpoint = NULL; EC_POINT *clnt_ecpoint = NULL;
@ -2495,7 +2495,7 @@ int ssl3_get_client_key_exchange(SSL *s)
} else } else
#endif /* OPENSSL_NO_KRB5 */ #endif /* OPENSSL_NO_KRB5 */
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_EC
if (alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe)) { if (alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe)) {
int ret = 1; int ret = 1;
int field_size = 0; int field_size = 0;
@ -2832,10 +2832,10 @@ int ssl3_get_client_key_exchange(SSL *s)
return (1); return (1);
f_err: f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al); ssl3_send_alert(s, SSL3_AL_FATAL, al);
#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) || 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_ECDH #ifndef OPENSSL_NO_EC
EVP_PKEY_free(clnt_pub_pkey); EVP_PKEY_free(clnt_pub_pkey);
EC_POINT_free(clnt_ecpoint); EC_POINT_free(clnt_ecpoint);
if (srvr_ecdh != NULL) if (srvr_ecdh != NULL)