diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-07-02 19:40:44 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-07-02 19:40:44 +0000 |
| commit | 3f2599d97d6ffe26e81eb46c43c7f0905c8fb762 (patch) | |
| tree | 3e6a88461ca4b871b4eddf14ad59549c49ec2ffc /ssl | |
| parent | 186a6f4876b6800fb0f12ab1f54a44621605dc5d (diff) | |
Fix code structure (if ... else if ... where both parts
may be disabled by preprocessor symbols)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 1977707947..783b1dce3e 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -935,10 +935,12 @@ static int ssl3_get_key_exchange(SSL *s) s->session->sess_cert->peer_rsa_tmp=rsa; rsa=NULL; } - else +#else /* NO_RSA */ + if (0) + ; #endif #ifndef NO_DH - if (alg & SSL_kEDH) + else if (alg & SSL_kEDH) { if ((dh=DH_new()) == NULL) { @@ -994,10 +996,12 @@ static int ssl3_get_key_exchange(SSL *s) #ifndef NO_RSA if (alg & SSL_aRSA) pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509); - else +#else + if (0) + ; #endif #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); #endif /* 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); goto f_err; } -#endif +#endif /* !NO_DH */ if (alg & SSL_aFZA) { al=SSL_AD_HANDSHAKE_FAILURE; |