Commit 12997aa9 authored by Rich Salz's avatar Rich Salz
Browse files

Revert "Add some casts for %j" 



This reverts commit c4d2e483.

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4160)
parent b158049c

apps/enc.c

+2 −4
Original line number Diff line number Diff line
@@ -555,10 +555,8 @@ int enc_main(int argc, char **argv) 


    ret = 0;

    if (verbose) {

        BIO_printf(bio_err, "bytes read   : %8ju\n",

                   (uintmax_t)BIO_number_read(in));

        BIO_printf(bio_err, "bytes written: %8ju\n",

                   (uintmax_t)BIO_number_written(out));

        BIO_printf(bio_err, "bytes read   : %8ju\n", BIO_number_read(in));

        BIO_printf(bio_err, "bytes written: %8ju\n", BIO_number_written(out));

    }

 end:

    ERR_print_errors(bio_err);

apps/s_client.c

+2 −2
Original line number Diff line number Diff line
@@ -3118,8 +3118,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
        BIO_printf(bio,

                   "---\nSSL handshake has read %ju bytes "

                   "and written %ju bytes\n",

                   (uintmax_t)BIO_number_read(SSL_get_rbio(s)),

                   (uintmax_t)BIO_number_written(SSL_get_wbio(s)));

                   BIO_number_read(SSL_get_rbio(s)),

                   BIO_number_written(SSL_get_wbio(s)));

    }

    print_verify_detail(s, bio);

    BIO_printf(bio, (SSL_session_reused(s) ? "---\nReused, " : "---\nNew, "));

crypto/asn1/x_int64.c

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ static int uint64_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it, 
                        int indent, const ASN1_PCTX *pctx)

{

    if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)

        return BIO_printf(out, "%jd\n", (intmax_t)**(int64_t **)pval);

    return BIO_printf(out, "%ju\n", (uintmax_t)**(uint64_t **)pval);

        return BIO_printf(out, "%jd\n", **(int64_t **)pval);

    return BIO_printf(out, "%ju\n", **(uint64_t **)pval);

}



/* 32-bit variants */

test/constant_time_test.c

+4 −6
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ static int test_binary_op_64(uint64_t (*op)(uint64_t a, uint64_t b), 


    if (is_true && c != CONSTTIME_TRUE_64) {

        TEST_error("TRUE %s op failed", op_name);

        BIO_printf(bio_err, "a=%jx b=%jx\n", (uintmax_t)a, (uintmax_t)b);

        BIO_printf(bio_err, "a=%jx b=%jx\n", a, b);

        return 0;

    } else if (!is_true && c != CONSTTIME_FALSE_64) {

        TEST_error("FALSE %s op failed", op_name);

        BIO_printf(bio_err, "a=%jx b=%jx\n", (uintmax_t)a, (uintmax_t)b);

        BIO_printf(bio_err, "a=%jx b=%jx\n", a, b);

        return 0;

    }

    return 1;
@@ -137,14 +137,12 @@ static int test_select_64(uint64_t a, uint64_t b) 


    if (selected != a) {

        TEST_error("test_select_64 TRUE failed");

        BIO_printf(bio_err, "a=%jx b=%jx got %jx wanted a\n",

                   (uintmax_t)a, (uintmax_t)b, (uintmax_t)selected);

        BIO_printf(bio_err, "a=%jx b=%jx got %jx wanted a\n", a, b, selected);

        return 0;

    }

    selected = constant_time_select_64(CONSTTIME_FALSE_64, a, b);

    if (selected != b) {

        BIO_printf(bio_err, "a=%jx b=%jx got %jx wanted b\n",

                   (uintmax_t)a, (uintmax_t)b, (uintmax_t)selected);

        BIO_printf(bio_err, "a=%jx b=%jx got %jx wanted b\n", a, b, selected);

        return 0;

    }

    return 1;