From: Bruno Haible Date: Mon, 4 Sep 2023 13:46:39 +0000 (+0200) Subject: crypto/* tests: Fix some gcc -Wdiscarded-qualifiers warnings. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c7887f2fc379d3034bcbe7221ccb1d96683aea14;p=gnulib.git crypto/* tests: Fix some gcc -Wdiscarded-qualifiers warnings. * tests/test-gc-hmac-md5.c (main): Change type of variables with a string literal initializer to 'const char *'. * tests/test-gc-hmac-sha1.c (main): Likewise. * tests/test-gc-hmac-sha256.c (main): Likewise. * tests/test-gc-hmac-sha512.c (main): Likewise. * tests/test-gc-md2.c (main): Likewise. * tests/test-gc-md5.c (main): Likewise. * tests/test-gc-sha1.c (main): Likewise. * tests/test-gc-sha256.c (main): Likewise. * tests/test-gc-sha512.c (main): Likewise. * tests/test-hmac-md5.c (main): Likewise. * tests/test-hmac-sha1.c (main): Likewise. * tests/test-hmac-sha256.c (main): Likewise. * tests/test-hmac-sha512.c (main): Likewise. --- diff --git a/ChangeLog b/ChangeLog index aaacdfad13..9e438aca6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2023-09-04 Bruno Haible + crypto/* tests: Fix some gcc -Wdiscarded-qualifiers warnings. + * tests/test-gc-hmac-md5.c (main): Change type of variables with a + string literal initializer to 'const char *'. + * tests/test-gc-hmac-sha1.c (main): Likewise. + * tests/test-gc-hmac-sha256.c (main): Likewise. + * tests/test-gc-hmac-sha512.c (main): Likewise. + * tests/test-gc-md2.c (main): Likewise. + * tests/test-gc-md5.c (main): Likewise. + * tests/test-gc-sha1.c (main): Likewise. + * tests/test-gc-sha256.c (main): Likewise. + * tests/test-gc-sha512.c (main): Likewise. + * tests/test-hmac-md5.c (main): Likewise. + * tests/test-hmac-sha1.c (main): Likewise. + * tests/test-hmac-sha256.c (main): Likewise. + * tests/test-hmac-sha512.c (main): Likewise. + file-has-acl: Avoid gcc warning. * lib/acl-internal.h (MIN): Remove definition. diff --git a/tests/test-gc-hmac-md5.c b/tests/test-gc-hmac-md5.c index 7817a4bc33..ea277f9d9e 100644 --- a/tests/test-gc-hmac-md5.c +++ b/tests/test-gc-hmac-md5.c @@ -37,12 +37,12 @@ main (int argc, char *argv[]) /* Test vectors from RFC 2104. */ { - char *key = + const char *key = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; size_t key_len = 16; - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d"; char out[16]; diff --git a/tests/test-gc-hmac-sha1.c b/tests/test-gc-hmac-sha1.c index 05c054de14..74cd3e3357 100644 --- a/tests/test-gc-hmac-sha1.c +++ b/tests/test-gc-hmac-sha1.c @@ -35,12 +35,12 @@ main (int argc, char *argv[]) } { - char *key = + const char *key = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; size_t key_len = 16; - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x67\x5b\x0b\x3a\x1b\x4d\xdf\x4e\x12\x48" "\x72\xda\x6c\x2f\x63\x2b\xfe\xd9\x57\xe9"; char out[GC_SHA1_DIGEST_SIZE]; diff --git a/tests/test-gc-hmac-sha256.c b/tests/test-gc-hmac-sha256.c index d9e81af9d3..3f5be6d261 100644 --- a/tests/test-gc-hmac-sha256.c +++ b/tests/test-gc-hmac-sha256.c @@ -35,12 +35,12 @@ main (int argc, char *argv[]) } { - char *key = + const char *key = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; size_t key_len = 20; - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7"; char out[GC_SHA256_DIGEST_SIZE]; diff --git a/tests/test-gc-hmac-sha512.c b/tests/test-gc-hmac-sha512.c index d017751536..ccff3438d7 100644 --- a/tests/test-gc-hmac-sha512.c +++ b/tests/test-gc-hmac-sha512.c @@ -35,12 +35,12 @@ main (int argc, char *argv[]) } { - char *key = + const char *key = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; size_t key_len = 20; - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54"; char out[GC_SHA512_DIGEST_SIZE]; diff --git a/tests/test-gc-md2.c b/tests/test-gc-md2.c index 73736031a8..5964128e78 100644 --- a/tests/test-gc-md2.c +++ b/tests/test-gc-md2.c @@ -38,9 +38,9 @@ main (int argc, char *argv[]) /* Test vectors from RFC 1319. */ { - char *in = "abcdefghijklmnopqrstuvwxyz"; + const char *in = "abcdefghijklmnopqrstuvwxyz"; size_t inlen = strlen (in); - char *expect = + const char *expect = "\x4e\x8d\xdf\xf3\x65\x02\x92\xab\x5a\x41\x08\xc3\xaa\x47\x94\x0b"; char out[16]; const char *p; diff --git a/tests/test-gc-md5.c b/tests/test-gc-md5.c index 7b1d0877d5..4822651259 100644 --- a/tests/test-gc-md5.c +++ b/tests/test-gc-md5.c @@ -38,9 +38,9 @@ main (int argc, char *argv[]) /* Test vectors from RFC 1321. */ { - char *in = "abcdefghijklmnopqrstuvwxyz"; + const char *in = "abcdefghijklmnopqrstuvwxyz"; size_t inlen = strlen (in); - char *expect = + const char *expect = "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1\x3b"; char out[16]; const char *p; diff --git a/tests/test-gc-sha1.c b/tests/test-gc-sha1.c index 7b35bfe472..79e0d17d36 100644 --- a/tests/test-gc-sha1.c +++ b/tests/test-gc-sha1.c @@ -36,9 +36,9 @@ main (int argc, char *argv[]) } { - char *in = "abcdefgh"; + const char *in = "abcdefgh"; size_t inlen = strlen (in); - char *expect = "\x42\x5a\xf1\x2a\x07\x43\x50\x2b" + const char *expect = "\x42\x5a\xf1\x2a\x07\x43\x50\x2b" "\x32\x2e\x93\xa0\x15\xbc\xf8\x68\xe3\x24\xd5\x6a"; char out[20]; const char *p; diff --git a/tests/test-gc-sha256.c b/tests/test-gc-sha256.c index d9214543b4..8157f92408 100644 --- a/tests/test-gc-sha256.c +++ b/tests/test-gc-sha256.c @@ -36,9 +36,9 @@ main (int argc, char *argv[]) } { - char *in = "abcdefghijklmnopqrstuvwxyz"; + const char *in = "abcdefghijklmnopqrstuvwxyz"; size_t inlen = strlen (in); - char *expect = + const char *expect = "\x71\xc4\x80\xdf\x93\xd6\xae\x2f\x1e\xfa\xd1\x44\x7c\x66\xc9\x52" "\x5e\x31\x62\x18\xcf\x51\xfc\x8d\x9e\xd8\x32\xf2\xda\xf1\x8b\x73"; char out[32]; diff --git a/tests/test-gc-sha512.c b/tests/test-gc-sha512.c index bf4c2b2e31..533a596a68 100644 --- a/tests/test-gc-sha512.c +++ b/tests/test-gc-sha512.c @@ -36,9 +36,9 @@ main (int argc, char *argv[]) } { - char *in = "abcdefghijklmnopqrstuvwxyz"; + const char *in = "abcdefghijklmnopqrstuvwxyz"; size_t inlen = strlen (in); - char *expect = + const char *expect = "\x4d\xbf\xf8\x6c\xc2\xca\x1b\xae\x1e\x16\x46\x8a\x05\xcb\x98\x81" "\xc9\x7f\x17\x53\xbc\xe3\x61\x90\x34\x89\x8f\xaa\x1a\xab\xe4\x29" "\x95\x5a\x1b\xf8\xec\x48\x3d\x74\x21\xfe\x3c\x16\x46\x61\x3a\x59" diff --git a/tests/test-hmac-md5.c b/tests/test-hmac-md5.c index b7181574a5..ef51382d16 100644 --- a/tests/test-hmac-md5.c +++ b/tests/test-hmac-md5.c @@ -59,19 +59,19 @@ main (int argc, char *argv[]) char key[16]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d"; hmac_check (key, key_len, data, data_len, digest); } { - char *key = "Jefe"; + const char *key = "Jefe"; size_t key_len = 4; - char *data = "what do ya want for nothing?"; + const char *data = "what do ya want for nothing?"; size_t data_len = 28; - char *digest = + const char *digest = "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38"; hmac_check (key, key_len, data, data_len, digest); } @@ -83,7 +83,7 @@ main (int argc, char *argv[]) char data[50]; size_t data_len = sizeof data; memset (data, '\xDD', sizeof data); - char *digest = + const char *digest = "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6"; hmac_check (key, key_len, data, data_len, digest); } @@ -92,9 +92,9 @@ main (int argc, char *argv[]) char key[65]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\xd6\x07\x5b\xee\x4d\x91\x80\xd8\xd1\xa2\x99\x29\x5e\x7c\xc9\xcb"; hmac_check (key, key_len, data, data_len, digest); } diff --git a/tests/test-hmac-sha1.c b/tests/test-hmac-sha1.c index 5967b9106d..721907e39a 100644 --- a/tests/test-hmac-sha1.c +++ b/tests/test-hmac-sha1.c @@ -57,20 +57,20 @@ main (int argc, char *argv[]) char key[16]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x67\x5b\x0b\x3a\x1b\x4d\xdf\x4e\x12\x48\x72\xda\x6c\x2f\x63\x2b" "\xfe\xd9\x57\xe9"; hmac_check (key, key_len, data, data_len, digest); } { - char *key = "Jefe"; + const char *key = "Jefe"; size_t key_len = 4; - char *data = "what do ya want for nothing?"; + const char *data = "what do ya want for nothing?"; size_t data_len = 28; - char *digest = + const char *digest = "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c" "\x25\x9a\x7c\x79"; hmac_check (key, key_len, data, data_len, digest); @@ -83,7 +83,7 @@ main (int argc, char *argv[]) char data[50]; size_t data_len = sizeof data; memset (data, '\xDD', sizeof data); - char *digest = + const char *digest = "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f" "\x63\xf1\x75\xd3"; hmac_check (key, key_len, data, data_len, digest); @@ -93,9 +93,9 @@ main (int argc, char *argv[]) char key[65]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x29\xda\xa9\xe9\xcc\x4b\x9f\x09\x48\x29\xdc\xd4\x03\xc0\x69\x27" "\xd8\xa9\x53\x93"; hmac_check (key, key_len, data, data_len, digest); diff --git a/tests/test-hmac-sha256.c b/tests/test-hmac-sha256.c index 5dd72dc23c..3295bb7056 100644 --- a/tests/test-hmac-sha256.c +++ b/tests/test-hmac-sha256.c @@ -57,20 +57,20 @@ main (int argc, char *argv[]) char key[20]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b" "\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7"; hmac_check (key, key_len, data, data_len, digest); } { - char *key = "Jefe"; + const char *key = "Jefe"; size_t key_len = 4; - char *data = "what do ya want for nothing?"; + const char *data = "what do ya want for nothing?"; size_t data_len = 28; - char *digest = + const char *digest = "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e\x6a\x04\x24\x26\x08\x95\x75\xc7" "\x5a\x00\x3f\x08\x9d\x27\x39\x83\x9d\xec\x58\xb9\x64\xec\x38\x43"; hmac_check (key, key_len, data, data_len, digest); @@ -83,7 +83,7 @@ main (int argc, char *argv[]) char data[50]; size_t data_len = sizeof data; memset (data, '\xDD', sizeof data); - char *digest = + const char *digest = "\x77\x3e\xa9\x1e\x36\x80\x0e\x46\x85\x4d\xb8\xeb\xd0\x91\x81\xa7" "\x29\x59\x09\x8b\x3e\xf8\xc1\x22\xd9\x63\x55\x14\xce\xd5\x65\xfe"; hmac_check (key, key_len, data, data_len, digest); @@ -93,9 +93,9 @@ main (int argc, char *argv[]) char key[65]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x72\x7b\x82\xfb\xa2\x64\x39\x3c\x5d\x67\xfd\x6d\x6a\xd7\x83\xe9" "\x01\x9a\x1f\xa6\xa8\x57\xfc\xcb\x70\xf5\x85\x2f\x04\xbe\x5d\x5d"; hmac_check (key, key_len, data, data_len, digest); diff --git a/tests/test-hmac-sha512.c b/tests/test-hmac-sha512.c index c4ad27cd06..c63fb9b48d 100644 --- a/tests/test-hmac-sha512.c +++ b/tests/test-hmac-sha512.c @@ -57,9 +57,9 @@ main (int argc, char *argv[]) char key[20]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0" "\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde" "\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4" @@ -68,11 +68,11 @@ main (int argc, char *argv[]) } { - char *key = "Jefe"; + const char *key = "Jefe"; size_t key_len = 4; - char *data = "what do ya want for nothing?"; + const char *data = "what do ya want for nothing?"; size_t data_len = 28; - char *digest = + const char *digest = "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3" "\x87\xbd\x64\x22\x2e\x83\x1f\xd6\x10\x27\x0c\xd7\xea\x25\x05\x54" "\x97\x58\xbf\x75\xc0\x5a\x99\x4a\x6d\x03\x4f\x65\xf8\xf0\xe6\xfd" @@ -87,7 +87,7 @@ main (int argc, char *argv[]) char data[50]; size_t data_len = sizeof data; memset (data, '\xDD', sizeof data); - char *digest = + const char *digest = "\xfa\x73\xb0\x08\x9d\x56\xa2\x84\xef\xb0\xf0\x75\x6c\x89\x0b\xe9" "\xb1\xb5\xdb\xdd\x8e\xe8\x1a\x36\x55\xf8\x3e\x33\xb2\x27\x9d\x39" "\xbf\x3e\x84\x82\x79\xa7\x22\xc8\x06\xb4\x85\xa4\x7e\x67\xc8\x07" @@ -99,9 +99,9 @@ main (int argc, char *argv[]) char key[129]; size_t key_len = sizeof key; memset (key, '\x0b', sizeof key); - char *data = "Hi There"; + const char *data = "Hi There"; size_t data_len = 8; - char *digest = + const char *digest = "\xaa\x1c\x23\xfe\x04\x0c\x4f\x3e\x65\x45\xa9\x15\x4e\x33\x9d\x17" "\xff\xb5\x27\x2e\x0a\x54\x5b\x84\xd3\x8b\x9b\xf8\xe2\xc7\x46\x4d" "\xf2\xd6\x2b\xb5\x00\x05\x57\x68\x6f\x85\x10\xeb\x43\x02\xa0\xca"