Commit f53537b1 authored by Christos Zoulas's avatar Christos Zoulas Committed by Viktor Dukhovni
Browse files

use the proper types to eliminate casts 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 91d0fd1c

test/hmactest.c

+17 −17
Original line number Diff line number Diff line
@@ -27,26 +27,26 @@ 


# ifndef OPENSSL_NO_MD5

static struct test_st {

    unsigned char key[16];

    const char key[16];

    int key_len;

    unsigned char data[64];

    const unsigned char data[64];

    int data_len;

    unsigned char *digest;

    const char *digest;

} test[8] = {

    {

        "", 0, "More text test vectors to stuff up EBCDIC machines :-)", 54,

        (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",

        "e9139d1e6ee064ef8cf514fc7dc83e86",

    },

    {

        {

            0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,

            0x0b, 0x0b, 0x0b, 0x0b, 0x0b,

        }, 16, "Hi There", 8,

        (unsigned char *)"9294727a3638bb1c13f48ef8158bfc9d",

        "9294727a3638bb1c13f48ef8158bfc9d",

    },

    {

        "Jefe", 4, "what do ya want for nothing?", 28,

        (unsigned char *)"750c783e6ab0b503eaa86e310a5db738",

        "750c783e6ab0b503eaa86e310a5db738",

    },

    {

        {
@@ -58,23 +58,23 @@ static struct test_st { 
            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,

            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,

            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd

        }, 50, (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",

        }, 50, "56be34521d144c88dbb8c733f0e8b3f6",

    },

    {

        "", 0, "My test data", 12,

        (unsigned char *)"61afdecb95429ef494d61fdee15990cabf0826fc"

        "61afdecb95429ef494d61fdee15990cabf0826fc"

    },

    {

        "", 0, "My test data", 12,

        (unsigned char *)"2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"

        "2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"

    },

    {

        "123456", 6, "My test data", 12,

        (unsigned char *)"bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"

        "bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"

    },

    {

        "12345", 5, "My test data again", 18,

        (unsigned char *)"a12396ceddd2a85f4c656bc1e0aa50c78cffde3e"

        "a12396ceddd2a85f4c656bc1e0aa50c78cffde3e"

    }

};

# endif
@@ -98,7 +98,7 @@ static int test_hmac_md5(int idx) 
                test[idx].data, test[idx].data_len, NULL, NULL),

                MD5_DIGEST_LENGTH);



    if (!TEST_str_eq(p, (char *)test[idx].digest))

    if (!TEST_str_eq(p, test[idx].digest))

      return 0;



    return 1;
@@ -149,7 +149,7 @@ static int test_hmac_run(void) 
        goto err;



    p = pt(buf, len);

    if (!TEST_str_eq(p, (char *)test[4].digest))

    if (!TEST_str_eq(p, test[4].digest))

        goto err;



    if (!TEST_false(HMAC_Init_ex(ctx, NULL, 0, EVP_sha256(), NULL)))
@@ -162,7 +162,7 @@ static int test_hmac_run(void) 
        goto err;



    p = pt(buf, len);

    if (!TEST_str_eq(p, (char *)test[5].digest))

    if (!TEST_str_eq(p, test[5].digest))

        goto err;



    if (!TEST_true(HMAC_Init_ex(ctx, test[6].key, test[6].key_len, NULL, NULL))
@@ -170,7 +170,7 @@ static int test_hmac_run(void) 
        || !TEST_true(HMAC_Final(ctx, buf, &len)))

        goto err;

    p = pt(buf, len);

    if (!TEST_str_eq(p, (char *)test[6].digest))

    if (!TEST_str_eq(p, test[6].digest))

        goto err;



    ret = 1;
@@ -187,7 +187,7 @@ static int test_hmac_single_shot(void) 
    /* Test single-shot with an empty key. */

    p = pt(HMAC(EVP_sha1(), NULL, 0, test[4].data, test[4].data_len,

                NULL, NULL), SHA_DIGEST_LENGTH);

    if (!TEST_str_eq(p, (char *)test[4].digest))

    if (!TEST_str_eq(p, test[4].digest))

        return 0;



    return 1;
@@ -214,7 +214,7 @@ static int test_hmac_copy(void) 
        goto err;



    p = pt(buf, len);

    if (!TEST_str_eq(p, (char *)test[7].digest))

    if (!TEST_str_eq(p, test[7].digest))

        goto err;



    ret = 1;