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

Remove unnuecessary ifdefs.

Browse Source 
If RSA or DSA is disabled we will never use a ciphersuite with
RSA/DSA authentication as it is already filtered out by the cipher
list logic.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-06-21 19:18:50 +01:00
parent a273c6eeee
commit 8df53b7a7c
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ssl/s3_clnt.c
View File

@ -1617,16 +1617,8 @@ int ssl3_get_key_exchange(SSL *s)
} }
/* We must check if there is a certificate */ /* We must check if there is a certificate */
# ifndef OPENSSL_NO_RSA if (alg_a & (SSL_aRSA|SSL_aDSS))
if (alg_a & SSL_aRSA)
pkey = X509_get_pubkey(s->session->peer); pkey = X509_get_pubkey(s->session->peer);
# else
if (0) ;
# endif
# ifndef OPENSSL_NO_DSA
else if (alg_a & SSL_aDSS)
pkey = X509_get_pubkey(s->session->peer);
# endif
} else } else
#endif /* !OPENSSL_NO_SRP */ #endif /* !OPENSSL_NO_SRP */
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
@ -1774,16 +1766,8 @@ int ssl3_get_key_exchange(SSL *s)
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_DH_KEY_TOO_SMALL); SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_DH_KEY_TOO_SMALL);
goto f_err; goto f_err;
} }
# ifndef OPENSSL_NO_RSA if (alg_a & (SSL_aRSA|SSL_aDSS))
if (alg_a & SSL_aRSA)
pkey = X509_get_pubkey(s->session->peer); pkey = X509_get_pubkey(s->session->peer);
# else
if (0) ;
# endif
# ifndef OPENSSL_NO_DSA
else if (alg_a & SSL_aDSS)
pkey = X509_get_pubkey(s->session->peer);
# endif
/* else anonymous DH, so no certificate or pkey. */ /* else anonymous DH, so no certificate or pkey. */
s->s3->peer_dh_tmp = dh; s->s3->peer_dh_tmp = dh;