Commit a836f9fa authored by Rich Salz's avatar Rich Salz
Browse files

Standardize syntax of sizeof(foo) 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4876)
parent 62f49440

apps/app_rand.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ int app_RAND_load_file(const char *file, int dont_warn) 
    char buffer[200];



    if (file == NULL)

        file = RAND_file_name(buffer, sizeof buffer);

        file = RAND_file_name(buffer, sizeof(buffer));

#ifndef OPENSSL_NO_EGD

    else if (RAND_egd(file) > 0) {

        /*
@@ -101,7 +101,7 @@ int app_RAND_write_file(const char *file) 
        return 0;



    if (file == NULL)

        file = RAND_file_name(buffer, sizeof buffer);

        file = RAND_file_name(buffer, sizeof(buffer));

    if (file == NULL || !RAND_write_file(file)) {

        BIO_printf(bio_err, "unable to write 'random state'\n");

        return 0;

apps/apps.c

+24 −24
Original line number Diff line number Diff line
@@ -1388,9 +1388,9 @@ int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial 
        OPENSSL_strlcpy(buf[0], serialfile, BSIZE);

    else {

#ifndef OPENSSL_SYS_VMS

        j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, suffix);

        j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, suffix);

#else

        j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, suffix);

        j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, suffix);

#endif

    }

    out = BIO_new_file(buf[0], "w");
@@ -1431,11 +1431,11 @@ int rotate_serial(const char *serialfile, const char *new_suffix, 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", serialfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", serialfile, old_suffix);

#else

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", serialfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", serialfile, old_suffix);

#endif

    if (rename(serialfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR
@@ -1504,9 +1504,9 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr) 
        goto err;



#ifndef OPENSSL_SYS_VMS

    BIO_snprintf(buf, sizeof buf, "%s.attr", dbfile);

    BIO_snprintf(buf, sizeof(buf), "%s.attr", dbfile);

#else

    BIO_snprintf(buf, sizeof buf, "%s-attr", dbfile);

    BIO_snprintf(buf, sizeof(buf), "%s-attr", dbfile);

#endif

    dbattr_conf = app_load_config(buf);
@@ -1567,13 +1567,13 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db) 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.attr.%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.attr.%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, suffix);

#else

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-attr-%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-attr-%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, suffix);

#endif

    out = BIO_new_file(buf[0], "w");

    if (out == NULL) {
@@ -1616,17 +1616,17 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s.attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s.attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s.attr.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, new_suffix);

#else

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s-attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s-attr-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s-attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s-attr-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, new_suffix);

#endif

    if (rename(dbfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR

apps/ciphers.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int ciphers_main(int argc, char **argv) 
                BIO_printf(bio_out, "%s - ", nm);

            }

#endif

            BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof buf));

            BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof(buf)));

        }

    }

apps/enc.c

+11 −11
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int enc_main(int argc, char **argv) 
    char *hkey = NULL, *hiv = NULL, *hsalt = NULL, *p;

    char *infile = NULL, *outfile = NULL, *prog;

    char *str = NULL, *passarg = NULL, *pass = NULL, *strbuf = NULL;

    char mbuf[sizeof magic - 1];

    char mbuf[sizeof(magic) - 1];

    OPTION_CHOICE o;

    int bsize = BSIZE, verbose = 0, debug = 0, olb64 = 0, nosalt = 0;

    int enc = 1, printkey = 0, i, k;
@@ -218,7 +218,7 @@ int enc_main(int argc, char **argv) 
            in = bio_open_default(opt_arg(), 'r', FORMAT_TEXT);

            if (in == NULL)

                goto opthelp;

            i = BIO_gets(in, buf, sizeof buf);

            i = BIO_gets(in, buf, sizeof(buf));

            BIO_free(in);

            in = NULL;

            if (i <= 0) {
@@ -311,7 +311,7 @@ int enc_main(int argc, char **argv) 
            for (;;) {

                char prompt[200];



                BIO_snprintf(prompt, sizeof prompt, "enter %s %s password:",

                BIO_snprintf(prompt, sizeof(prompt), "enter %s %s password:",

                             OBJ_nid2ln(EVP_CIPHER_nid(cipher)),

                             (enc) ? "encryption" : "decryption");

                strbuf[0] = '\0';
@@ -398,31 +398,31 @@ int enc_main(int argc, char **argv) 
            else {

                if (enc) {

                    if (hsalt) {

                        if (!set_hex(hsalt, salt, sizeof salt)) {

                        if (!set_hex(hsalt, salt, sizeof(salt))) {

                            BIO_printf(bio_err, "invalid hex salt value\n");

                            goto end;

                        }

                    } else if (RAND_bytes(salt, sizeof salt) <= 0)

                    } else if (RAND_bytes(salt, sizeof(salt)) <= 0)

                        goto end;

                    /*

                     * If -P option then don't bother writing

                     */

                    if ((printkey != 2)

                        && (BIO_write(wbio, magic,

                                      sizeof magic - 1) != sizeof magic - 1

                                      sizeof(magic) - 1) != sizeof(magic) - 1

                            || BIO_write(wbio,

                                         (char *)salt,

                                         sizeof salt) != sizeof salt)) {

                                         sizeof(salt)) != sizeof(salt))) {

                        BIO_printf(bio_err, "error writing output file\n");

                        goto end;

                    }

                } else if (BIO_read(rbio, mbuf, sizeof mbuf) != sizeof mbuf

                } else if (BIO_read(rbio, mbuf, sizeof(mbuf)) != sizeof(mbuf)

                           || BIO_read(rbio,

                                       (unsigned char *)salt,

                                       sizeof salt) != sizeof salt) {

                                       sizeof(salt)) != sizeof(salt)) {

                    BIO_printf(bio_err, "error reading input file\n");

                    goto end;

                } else if (memcmp(mbuf, magic, sizeof magic - 1)) {

                } else if (memcmp(mbuf, magic, sizeof(magic) - 1)) {

                    BIO_printf(bio_err, "bad magic number\n");

                    goto end;

                }
@@ -449,7 +449,7 @@ int enc_main(int argc, char **argv) 
            int siz = EVP_CIPHER_iv_length(cipher);

            if (siz == 0) {

                BIO_printf(bio_err, "warning: iv not use by this cipher\n");

            } else if (!set_hex(hiv, iv, sizeof iv)) {

            } else if (!set_hex(hiv, iv, sizeof(iv))) {

                BIO_printf(bio_err, "invalid hex iv value\n");

                goto end;

            }

apps/errstr.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int errstr_main(int argc, char **argv) 
             */

            OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS

                             | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);

            ERR_error_string_n(l, buf, sizeof buf);

            ERR_error_string_n(l, buf, sizeof(buf));

            BIO_printf(bio_out, "%s\n", buf);

        }

    }