diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-17 21:41:13 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-17 21:41:13 +0000 |
| commit | c86dd888861fbe6ccf10b02002286348c86463f4 (patch) | |
| tree | a98c12a35afd291bb3f12dec805932fe51f7a389 /lib | |
| parent | 1452f8bb6aadca74b2a23c2cba09a2bf0de48546 (diff) | |
no longer need to fool emacs indentation and other if (0) oddities.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/d1_clnt.c | 5 | ||||
| -rw-r--r-- | lib/libssl/s3_clnt.c | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c index 1ad65ba5416..b919baf7faa 100644 --- a/lib/libssl/d1_clnt.c +++ b/lib/libssl/d1_clnt.c @@ -945,10 +945,7 @@ dtls1_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]; 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]; |