summaryrefslogtreecommitdiffstats
path: root/lib/libssl/s3_clnt.c
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-17 21:41:12 +0000
committertedu <tedu@openbsd.org>2014-04-17 21:41:12 +0000
commit0cc59c64afb2fe888f40f2e1a47913c18ec9aaef (patch)
tree9e9afbeda4f6c2e0753f01a5f23a1aedc87333f3 /lib/libssl/s3_clnt.c
parentalways build in RSA and DSA. ok deraadt miod (diff)
downloadwireguard-openbsd-0cc59c64afb2fe888f40f2e1a47913c18ec9aaef.tar.xz
wireguard-openbsd-0cc59c64afb2fe888f40f2e1a47913c18ec9aaef.zip
no longer need to fool emacs indentation and other if (0) oddities.
Diffstat (limited to 'lib/libssl/s3_clnt.c')
-rw-r--r--lib/libssl/s3_clnt.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c
index 52e2174f6bb..abae12a8d16 100644
--- a/lib/libssl/s3_clnt.c
+++ b/lib/libssl/s3_clnt.c
@@ -1535,8 +1535,7 @@ ssl3_get_key_exchange(SSL *s)
* the use of DSA to sign ECParameters in the server
* key exchange message. We do support RSA and ECDSA.
*/
- if (0);
- else if (alg_a & SSL_aRSA)
+ if (alg_a & SSL_aRSA)
pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
#ifndef OPENSSL_NO_ECDSA
else if (alg_a & SSL_aECDSA)
@@ -2031,10 +2030,7 @@ ssl3_send_client_key_exchange(SSL *s)
alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
- /* Fool emacs indentation */
- if (0) {
- }
- else if (alg_k & SSL_kRSA) {
+ if (alg_k & SSL_kRSA) {
RSA *rsa;
unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];