Commit e8aa8b6c authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Fix a few if(, for(, while( inside code. 



Fix some indentation at the same time

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1292)
parent c106eaa8

crypto/bio/bss_mem.c

+4 −4
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int mem_buf_free(BIO *a, int free_all) 
 */

static int mem_buf_sync(BIO *b)

{

    if((b != NULL) && (b->init) && (b->ptr != NULL)) {

    if (b != NULL && b->init != 0 && b->ptr != NULL) {

        BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;



        if (bbm->readp->data != bbm->buf->data) {

crypto/include/internal/evp_int.h

+21 −16
Original line number Diff line number Diff line
@@ -195,7 +195,12 @@ static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
    while (inl && inl >= chunk)\

    {\

        int num = EVP_CIPHER_CTX_num(ctx);\

            cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &EVP_C_DATA(kstruct,ctx)->ksched, EVP_CIPHER_CTX_iv_noconst(ctx), &num, EVP_CIPHER_CTX_encrypting(ctx)); \

        cprefix##_cfb##cbits##_encrypt(in, out, (long) \

            ((cbits == 1) \

                && !EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS) \

                ? inl*8 : inl), \

            &EVP_C_DATA(kstruct, ctx)->ksched, EVP_CIPHER_CTX_iv_noconst(ctx),\

            &num, EVP_CIPHER_CTX_encrypting(ctx));\

        EVP_CIPHER_CTX_set_num(ctx, num);\

        inl -= chunk;\

        in += chunk;\

ssl/statem/statem_lib.c

+5 −6
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ int tls_get_message_header(SSL *s, int *mt) 
        /*

         * Only happens with SSLv3+ in an SSLv2 backward compatible

         * ClientHello

         */

         /*

         *

         * Total message size is the remaining record bytes to read

         * plus the SSL3_HM_HEADER_LENGTH bytes that we already read

         */

ssl/record/ssl3_record.c

+5 −5

File changed.

Contains only whitespace changes.

crypto/aes/aes_core.c

+4 −4

File changed.

Contains only whitespace changes.

crypto/async/async.c

+2 −2

File changed.

Contains only whitespace changes.

crypto/o_fopen.c

+1 −1

File changed.

Contains only whitespace changes.

include/openssl/engine.h

+7 −7

File changed.

Contains only whitespace changes.

ssl/ssl_lib.c

+7 −7

File changed.

Contains only whitespace changes.

ssl/ssl_sess.c

+2 −2

File changed.

Contains only whitespace changes.

apps/s_server.c

+3 −3

File changed.

Contains only whitespace changes.

ssl/statem/statem.c

+14 −14

File changed.

Contains only whitespace changes.

apps/apps.c

+2 −2

File changed.

Contains only whitespace changes.

crypto/async/arch/async_win.c

+1 −1

File changed.

Contains only whitespace changes.

ssl/record/rec_layer_s3.c

+2 −2

File changed.

Contains only whitespace changes.

ssl/statem/statem_dtls.c

+1 −1

File changed.

Contains only whitespace changes.

ssl/statem/statem_srvr.c

+96 −96

File changed.

Contains only whitespace changes.

crypto/bn/bn_lcl.h

+15 −15

File changed.

Contains only whitespace changes.

crypto/x509/x_x509a.c

+1 −1

File changed.

Contains only whitespace changes.

ssl/d1_lib.c

+6 −6

File changed.

Contains only whitespace changes.

test/asynctest.c

+1 −1

File changed.

Contains only whitespace changes.

test/verify_extra_test.c

+1 −1

File changed.

Contains only whitespace changes.