Commit 72d8b823 authored by Paul Yang's avatar Paul Yang Committed by Richard Levitte
Browse files

Fix coding style in apps/passwd file 



Reformat some indents and braces based on OpenSSL coding style spec.

Signed-off-by: default avatarPaul Yang <paulyang.inf@gmail.com>

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3586)
parent 3f23390b

apps/passwd.c

+26 −27
Original line number Diff line number Diff line
@@ -240,17 +240,23 @@ int passwd_main(int argc, char **argv) 
    }



    if ((in == NULL) && (passwds == NULL)) {

        /*

         * we use the following method to make sure what

         * in the 'else' section is always compiled, to

         * avoid rot of not-frequently-used code.

         */

        if (1) {

# ifndef OPENSSL_NO_UI

            /* build a null-terminated list */

            static char *passwds_static[2] = { NULL, NULL };



            passwds = passwds_static;

            if (in == NULL)

            if (in == NULL) {

                if (EVP_read_pw_string

                    (passwd_malloc, passwd_malloc_size, "Password: ",

                     !(passed_salt || in_noverify)) != 0)

                    goto end;

            }

            passwds[0] = passwd_malloc;

        } else {

# endif
@@ -259,7 +265,6 @@ int passwd_main(int argc, char **argv) 
        }

    }





    if (in == NULL) {

        assert(passwds != NULL);

        assert(*passwds != NULL);
@@ -269,11 +274,9 @@ int passwd_main(int argc, char **argv) 
            if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out,

                           quiet, table, reverse, pw_maxlen, mode))

                goto end;

        }

        while (*passwds != NULL);

    } else

        } while (*passwds != NULL);

    } else {

        /* in != NULL */

    {

        int done;



        assert(passwd != NULL);
@@ -281,9 +284,9 @@ int passwd_main(int argc, char **argv) 
            int r = BIO_gets(in, passwd, pw_maxlen + 1);

            if (r > 0) {

                char *c = (strchr(passwd, '\n'));

                if (c != NULL)

                if (c != NULL) {

                    *c = 0;     /* truncate at newline */

                else {

                } else {

                    /* ignore rest of line */

                    char trash[BUFSIZ];

                    do
@@ -297,8 +300,7 @@ int passwd_main(int argc, char **argv) 
                    goto end;

            }

            done = (r <= 0);

        }

        while (!done);

        } while (!done);

    }

    ret = 0;
@@ -746,9 +748,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, 
    if (!passed_salt) {

# ifndef OPENSSL_NO_DES

        if (mode == passwd_crypt) {

            if (*salt_malloc_p == NULL) {

            if (*salt_malloc_p == NULL)

                *salt_p = *salt_malloc_p = app_malloc(3, "salt buffer");

            }

            if (RAND_bytes((unsigned char *)*salt_p, 2) <= 0)

                goto end;

            (*salt_p)[0] = cov_2char[(*salt_p)[0] & 0x3f]; /* 6 bits */
@@ -765,9 +766,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, 
        if (mode == passwd_md5 || mode == passwd_apr1 || mode == passwd_aixmd5) {

            int i;



            if (*salt_malloc_p == NULL) {

            if (*salt_malloc_p == NULL)

                *salt_p = *salt_malloc_p = app_malloc(9, "salt buffer");

            }

            if (RAND_bytes((unsigned char *)*salt_p, 8) <= 0)

                goto end;
@@ -781,9 +781,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, 
        if (mode == passwd_sha256 || mode == passwd_sha512) {

            int i;



            if (*salt_malloc_p == NULL) {

            if (*salt_malloc_p == NULL)

                *salt_p = *salt_malloc_p = app_malloc(17, "salt buffer");

            }

            if (RAND_bytes((unsigned char *)*salt_p, 16) <= 0)

                goto end;