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

Fix code structure (if ... else if ... where both parts

Browse Source 
may be disabled by preprocessor symbols)
This commit is contained in:
Bodo Möller 2000-07-02 19:40:44 +00:00
parent 186a6f4876
commit 3f2599d97d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssl/s3_clnt.c
View File

@ -935,10 +935,12 @@ static int ssl3_get_key_exchange(SSL *s)
s->session->sess_cert->peer_rsa_tmp=rsa; s->session->sess_cert->peer_rsa_tmp=rsa;
rsa=NULL; rsa=NULL;
} }
else #else /* NO_RSA */
if (0)
;
#endif #endif
#ifndef NO_DH #ifndef NO_DH
if (alg & SSL_kEDH) else if (alg & SSL_kEDH)
{ {
if ((dh=DH_new()) == NULL) if ((dh=DH_new()) == NULL)
{ {
@ -994,10 +996,12 @@ static int ssl3_get_key_exchange(SSL *s)
#ifndef NO_RSA #ifndef NO_RSA
if (alg & SSL_aRSA) if (alg & SSL_aRSA)
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509); pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
else #else
if (0)
;
#endif #endif
#ifndef NO_DSA #ifndef NO_DSA
if (alg & SSL_aDSS) else if (alg & SSL_aDSS)
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509); pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
#endif #endif
/* else anonymous DH, so no certificate or pkey. */ /* else anonymous DH, so no certificate or pkey. */
@ -1011,7 +1015,7 @@ static int ssl3_get_key_exchange(SSL *s)
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER); SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
goto f_err; goto f_err;
} }
#endif #endif /* !NO_DH */
if (alg & SSL_aFZA) if (alg & SSL_aFZA)
{ {
al=SSL_AD_HANDSHAKE_FAILURE; al=SSL_AD_HANDSHAKE_FAILURE;