Fix bad indenting in LibreSSL.

jsg@ noticed that some of the lines in libssl and libcrypto are not
indented properly.  At a quick glance, it looks like it has a different
control flow than it really does.  I checked the history in our tree and
in OpenSSL to make sure these were simple mistakes.

ok miod@ jsing@

10 files changed, 24 insertions, 24 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index 74d40611ee..940964cac3 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.38 2015/02/14 15:10:39 miod Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.39 2015/06/13 08:38:10 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -393,7 +393,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
         if (BN_bin2bn(buf, num, f) == NULL)
                 goto err;
 
-                if (BN_ucmp(f, rsa->n) >= 0) {
+        if (BN_ucmp(f, rsa->n) >= 0) {
                 /* usually the padding functions would catch this */
                 RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,
                     RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c
index 58335b4e64..d0dcffb290 100644
--- a/src/lib/libcrypto/x509/x509type.c
+++ b/src/lib/libcrypto/x509/x509type.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509type.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509type.c,v 1.12 2015/06/13 08:38:10 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -121,9 +121,9 @@ X509_certificate_type(X509 *x, EVP_PKEY *pkey)
                 }
         }
 
-        if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
-                                           for, not bytes */
-        ret |= EVP_PKT_EXP;
+        /* /8 because it's 1024 bits we look for, not bytes */
+        if (EVP_PKEY_size(pk) <= 1024 / 8)
+                ret |= EVP_PKT_EXP;
         if (pkey == NULL)
                 EVP_PKEY_free(pk);
         return (ret);
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index e44c8a0c94..adde3cd39e 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.44 2015/03/27 12:29:54 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.45 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -417,7 +417,7 @@ dtls1_connect(SSL *s)
                         ret = dtls1_send_client_verify(s);
                         if (ret <= 0)
                                 goto end;
-                                s->state = SSL3_ST_CW_CHANGE_A;
+                        s->state = SSL3_ST_CW_CHANGE_A;
                         s->init_num = 0;
                         s->s3->change_cipher_spec = 0;
                         break;
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index c997b7f212..a3ba33548e 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.40 2015/02/09 10:53:28 jsing Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.41 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1437,7 +1437,7 @@ dtls1_dispatch_alert(SSL *s)
                 || s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
 #endif
                 )
-                (void)BIO_flush(s->wbio);
+                        (void)BIO_flush(s->wbio);
 
                 if (s->msg_callback)
                         s->msg_callback(1, s->version, SSL3_RT_ALERT,
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 27f350fcb6..bd3a8e1a42 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.51 2015/05/15 11:00:14 jsg Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.52 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -525,7 +525,7 @@ dtls1_accept(SSL *s)
                         ret = ssl3_get_cert_verify(s);
                         if (ret <= 0)
                                 goto end;
-                                s->state = SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
                         s->init_num = 0;
                         break;
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
index 74d40611ee..940964cac3 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.38 2015/02/14 15:10:39 miod Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.39 2015/06/13 08:38:10 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -393,7 +393,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
         if (BN_bin2bn(buf, num, f) == NULL)
                 goto err;
 
-                if (BN_ucmp(f, rsa->n) >= 0) {
+        if (BN_ucmp(f, rsa->n) >= 0) {
                 /* usually the padding functions would catch this */
                 RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,
                     RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
diff --git a/src/lib/libssl/src/crypto/x509/x509type.c b/src/lib/libssl/src/crypto/x509/x509type.c
index 58335b4e64..d0dcffb290 100644
--- a/src/lib/libssl/src/crypto/x509/x509type.c
+++ b/src/lib/libssl/src/crypto/x509/x509type.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509type.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509type.c,v 1.12 2015/06/13 08:38:10 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -121,9 +121,9 @@ X509_certificate_type(X509 *x, EVP_PKEY *pkey)
                 }
         }
 
-        if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
-                                           for, not bytes */
-        ret |= EVP_PKT_EXP;
+        /* /8 because it's 1024 bits we look for, not bytes */
+        if (EVP_PKEY_size(pk) <= 1024 / 8)
+                ret |= EVP_PKT_EXP;
         if (pkey == NULL)
                 EVP_PKEY_free(pk);
         return (ret);
diff --git a/src/lib/libssl/src/ssl/d1_clnt.c b/src/lib/libssl/src/ssl/d1_clnt.c
index e44c8a0c94..adde3cd39e 100644
--- a/src/lib/libssl/src/ssl/d1_clnt.c
+++ b/src/lib/libssl/src/ssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.44 2015/03/27 12:29:54 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.45 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -417,7 +417,7 @@ dtls1_connect(SSL *s)
                         ret = dtls1_send_client_verify(s);
                         if (ret <= 0)
                                 goto end;
-                                s->state = SSL3_ST_CW_CHANGE_A;
+                        s->state = SSL3_ST_CW_CHANGE_A;
                         s->init_num = 0;
                         s->s3->change_cipher_spec = 0;
                         break;
diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c
index c997b7f212..a3ba33548e 100644
--- a/src/lib/libssl/src/ssl/d1_pkt.c
+++ b/src/lib/libssl/src/ssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.40 2015/02/09 10:53:28 jsing Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.41 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1437,7 +1437,7 @@ dtls1_dispatch_alert(SSL *s)
                 || s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
 #endif
                 )
-                (void)BIO_flush(s->wbio);
+                        (void)BIO_flush(s->wbio);
 
                 if (s->msg_callback)
                         s->msg_callback(1, s->version, SSL3_RT_ALERT,
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index 27f350fcb6..bd3a8e1a42 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.51 2015/05/15 11:00:14 jsg Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.52 2015/06/13 08:38:10 doug Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -525,7 +525,7 @@ dtls1_accept(SSL *s)
                         ret = ssl3_get_cert_verify(s);
                         if (ret <= 0)
                                 goto end;
-                                s->state = SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
                         s->init_num = 0;
                         break;