no longer need to fool emacs indentation and other if (0) oddities.

5 files changed, 7 insertions, 23 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 1ad65ba541..b919baf7fa 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/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/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)
                  * 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];
 
diff --git a/src/lib/libssl/src/ssl/d1_clnt.c b/src/lib/libssl/src/ssl/d1_clnt.c
index 1ad65ba541..b919baf7fa 100644
--- a/src/lib/libssl/src/ssl/d1_clnt.c
+++ b/src/lib/libssl/src/ssl/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/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 52e2174f6b..abae12a8d1 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/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];
 
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 1ce08c957d..700189db43 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -355,9 +355,7 @@ print_details(SSL *c_ssl, const char *prefix)
         if (cert != NULL) {
                 EVP_PKEY *pkey = X509_get_pubkey(cert);
                 if (pkey != NULL) {
-                        if (0)
-;
-                        else if (pkey->type == EVP_PKEY_RSA &&
+                        if (pkey->type == EVP_PKEY_RSA &&
                             pkey->pkey.rsa != NULL &&
                             pkey->pkey.rsa->n != NULL) {
                                 BIO_printf(bio_stdout, ", %d bit RSA",