diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 52e2174f6b..abae12a8d1 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1535,8 +1535,7 @@ ssl3_get_key_exchange(SSL *s) | |||
1535 | * the use of DSA to sign ECParameters in the server | 1535 | * the use of DSA to sign ECParameters in the server |
1536 | * key exchange message. We do support RSA and ECDSA. | 1536 | * key exchange message. We do support RSA and ECDSA. |
1537 | */ | 1537 | */ |
1538 | if (0); | 1538 | if (alg_a & SSL_aRSA) |
1539 | else if (alg_a & SSL_aRSA) | ||
1540 | pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509); | 1539 | pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509); |
1541 | #ifndef OPENSSL_NO_ECDSA | 1540 | #ifndef OPENSSL_NO_ECDSA |
1542 | else if (alg_a & SSL_aECDSA) | 1541 | else if (alg_a & SSL_aECDSA) |
@@ -2031,10 +2030,7 @@ ssl3_send_client_key_exchange(SSL *s) | |||
2031 | 2030 | ||
2032 | alg_k = s->s3->tmp.new_cipher->algorithm_mkey; | 2031 | alg_k = s->s3->tmp.new_cipher->algorithm_mkey; |
2033 | 2032 | ||
2034 | /* Fool emacs indentation */ | 2033 | if (alg_k & SSL_kRSA) { |
2035 | if (0) { | ||
2036 | } | ||
2037 | else if (alg_k & SSL_kRSA) { | ||
2038 | RSA *rsa; | 2034 | RSA *rsa; |
2039 | unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH]; | 2035 | unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH]; |
2040 | 2036 | ||