wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes for gcc 8 string warnings

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-12-28 15:03:14 -07:00
parent a1459f6fec
commit 47f5282416
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mcapi/mcapi_test.c
View File

@ -404,7 +404,7 @@ static int check_hmac(void)
byte mcDigest[CRYPT_SHA512_DIGEST_SIZE]; byte mcDigest[CRYPT_SHA512_DIGEST_SIZE];
byte defDigest[WC_SHA512_DIGEST_SIZE]; byte defDigest[WC_SHA512_DIGEST_SIZE];
strncpy((char*)key, "Jefe", 4); memcpy((char*)key, "Jefe", 4);
/* SHA1 */ /* SHA1 */
CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA, key, 4); CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA, key, 4);
@ -684,8 +684,8 @@ static int check_des3(void)
byte out1[TDES_TEST_SIZE]; byte out1[TDES_TEST_SIZE];
byte out2[TDES_TEST_SIZE]; byte out2[TDES_TEST_SIZE];
strncpy((char*)key, "1234567890abcdefghijklmn", 24); memcpy((char*)key, "1234567890abcdefghijklmn", 24);
strncpy((char*)iv, "12345678", 8); memcpy((char*)iv, "12345678", 8);
/* cbc encrypt */ /* cbc encrypt */
ret = CRYPT_TDES_KeySet(&mcDes3, key, iv, CRYPT_TDES_ENCRYPTION); ret = CRYPT_TDES_KeySet(&mcDes3, key, iv, CRYPT_TDES_ENCRYPTION);
@ -765,8 +765,8 @@ static int check_aescbc(void)
byte out1[AES_TEST_SIZE]; byte out1[AES_TEST_SIZE];
byte out2[AES_TEST_SIZE]; byte out2[AES_TEST_SIZE];
strncpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32); memcpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32);
strncpy((char*)iv, "1234567890abcdef", 16); memcpy((char*)iv, "1234567890abcdef", 16);
/* 128 cbc encrypt */ /* 128 cbc encrypt */
ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION); ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION);
@ -942,8 +942,8 @@ static int check_aesctr(void)
byte out1[AES_TEST_SIZE]; byte out1[AES_TEST_SIZE];
byte out2[AES_TEST_SIZE]; byte out2[AES_TEST_SIZE];
strncpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32); memcpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32);
strncpy((char*)iv, "1234567890abcdef", 16); memcpy((char*)iv, "1234567890abcdef", 16);
/* 128 ctr encrypt */ /* 128 ctr encrypt */
ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION); ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION);
@ -1110,8 +1110,8 @@ static int check_aesdirect(void)
byte out1[CRYPT_AES_BLOCK_SIZE]; byte out1[CRYPT_AES_BLOCK_SIZE];
byte out2[16]; /* one block at a time */ byte out2[16]; /* one block at a time */
strncpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32); memcpy((char*)key, "1234567890abcdefghijklmnopqrstuv", 32);
strncpy((char*)iv, "1234567890abcdef", 16); memcpy((char*)iv, "1234567890abcdef", 16);
/* 128 direct encrypt */ /* 128 direct encrypt */
ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION); ret = CRYPT_AES_KeySet(&mcAes, key, 16, iv, CRYPT_AES_ENCRYPTION);

16
wolfcrypt/src/wc_port.c
View File

@ -308,15 +308,17 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
while ((ctx->entry = readdir(ctx->dir)) != NULL) { while ((ctx->entry = readdir(ctx->dir)) != NULL) {
dnameLen = (int)XSTRLEN(ctx->entry->d_name); dnameLen = (int)XSTRLEN(ctx->entry->d_name);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 >= MAX_FILENAME_SZ) {
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
XSTRNCPY(ctx->name + pathLen + 1,
ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1);
/* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because
* of earlier check it is known that dnameLen is less than
* MAX_FILENAME_SZ - (pathLen + 2) so dnameLen +1 will fit */
XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, dnameLen + 1);
if (stat(ctx->name, &ctx->s) != 0) { if (stat(ctx->name, &ctx->s) != 0) {
WOLFSSL_MSG("stat on name failed"); WOLFSSL_MSG("stat on name failed");
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
@ -372,14 +374,16 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
while ((ctx->entry = readdir(ctx->dir)) != NULL) { while ((ctx->entry = readdir(ctx->dir)) != NULL) {
dnameLen = (int)XSTRLEN(ctx->entry->d_name); dnameLen = (int)XSTRLEN(ctx->entry->d_name);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 >= MAX_FILENAME_SZ) {
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
XSTRNCPY(ctx->name + pathLen + 1, /* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because
ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1); * of earlier check it is known that dnameLen is less than
* MAX_FILENAME_SZ - (pathLen + 2) so that dnameLen +1 will fit */
XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, dnameLen + 1);
if (stat(ctx->name, &ctx->s) != 0) { if (stat(ctx->name, &ctx->s) != 0) {
WOLFSSL_MSG("stat on name failed"); WOLFSSL_MSG("stat on name failed");