Merge pull request #4787 from gilles-peskine-arm/fix-clang12-Wstring-concatenation-2.16

Backport 2.16: Prevent triggering Clang 12 -Wstring-concatenation warning
This commit is contained in:
Ronald Cron
2021-07-23 14:07:58 +02:00
committed by GitHub
5 changed files with 5 additions and 10 deletions
+1 -2
View File
@@ -320,8 +320,7 @@ static const unsigned char md2_test_str[7][81] =
{ "message digest" }, { "message digest" },
{ "abcdefghijklmnopqrstuvwxyz" }, { "abcdefghijklmnopqrstuvwxyz" },
{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
{ "12345678901234567890123456789012345678901234567890123456789012" { "12345678901234567890123456789012345678901234567890123456789012345678901234567890" }
"345678901234567890" }
}; };
static const size_t md2_test_strlen[7] = static const size_t md2_test_strlen[7] =
+1 -2
View File
@@ -444,8 +444,7 @@ static const unsigned char md4_test_str[7][81] =
{ "message digest" }, { "message digest" },
{ "abcdefghijklmnopqrstuvwxyz" }, { "abcdefghijklmnopqrstuvwxyz" },
{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
{ "12345678901234567890123456789012345678901234567890123456789012" { "12345678901234567890123456789012345678901234567890123456789012345678901234567890" }
"345678901234567890" }
}; };
static const size_t md4_test_strlen[7] = static const size_t md4_test_strlen[7] =
+1 -2
View File
@@ -458,8 +458,7 @@ static const unsigned char md5_test_buf[7][81] =
{ "message digest" }, { "message digest" },
{ "abcdefghijklmnopqrstuvwxyz" }, { "abcdefghijklmnopqrstuvwxyz" },
{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
{ "12345678901234567890123456789012345678901234567890123456789012" { "12345678901234567890123456789012345678901234567890123456789012345678901234567890" }
"345678901234567890" }
}; };
static const size_t md5_test_buflen[7] = static const size_t md5_test_buflen[7] =
+1 -2
View File
@@ -514,8 +514,7 @@ static const unsigned char ripemd160_test_str[TESTS][81] =
{ "abcdefghijklmnopqrstuvwxyz" }, { "abcdefghijklmnopqrstuvwxyz" },
{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" }, { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
{ "12345678901234567890123456789012345678901234567890123456789012" { "12345678901234567890123456789012345678901234567890123456789012345678901234567890" },
"345678901234567890" },
}; };
static const size_t ripemd160_test_strlen[TESTS] = static const size_t ripemd160_test_strlen[TESTS] =
+1 -2
View File
@@ -527,8 +527,7 @@ void mbedtls_sha512( const unsigned char *input,
static const unsigned char sha512_test_buf[3][113] = static const unsigned char sha512_test_buf[3][113] =
{ {
{ "abc" }, { "abc" },
{ "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
{ "" } { "" }
}; };