Skip to content

Fix increments for void pointers #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kojiws wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Fix increments for void pointers #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion port/posix/posix_transport_shm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ int posixTransportShm_ClientStaticMemDmaCallback(

if ((dmaPtr != NULL) && (dmaSize > 0) && (len < dmaSize) &&
(clientAddr >= (uintptr_t)dmaPtr) &&
(clientAddr < (uintptr_t)(dmaPtr + dmaSize - len))) {
(clientAddr < (uintptr_t)((uint8_t*)dmaPtr + dmaSize - len))) {
dmaBuffer = clientAddr;
isInDma = 1;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wh_server_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ static int _HandleRsaFunction(whServerContext* ctx, uint16_t magic, int devId,
}

/* in and out are after the fixed size fields */
byte* in = (uint8_t*)(cryptoDataIn + sizeof(whMessageCrypto_RsaRequest));
byte* out = (uint8_t*)(cryptoDataOut + sizeof(whMessageCrypto_RsaResponse));
const byte* in = (const byte*)cryptoDataIn + sizeof(whMessageCrypto_RsaRequest);
byte* out = (byte*)cryptoDataOut + sizeof(whMessageCrypto_RsaResponse);

WH_DEBUG_SERVER_VERBOSE("HandleRsaFunction opType:%d inLen:%u keyId:%u outLen:%u\n",
op_type, in_len, key_id, out_len);
Expand Down
4 changes: 2 additions & 2 deletions src/wh_server_keystore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ static int _AesGcmKeyUnwrapWithKek(whServerContext* server,

/* Extract IV and authTag from wrappedKeyIn */
memcpy(iv, wrappedKeyIn, sizeof(iv));
memcpy(authTag, wrappedKeyIn + sizeof(iv), sizeof(authTag));
memcpy(authTag, (const uint8_t*)wrappedKeyIn + sizeof(iv), sizeof(authTag));

/* Decrypt the encrypted blob */
ret = wc_AesGcmDecrypt(aes, plainBlob, encBlob, encBlobSz, iv, sizeof(iv),
Expand Down Expand Up @@ -1669,7 +1669,7 @@ static int _AesGcmDataUnwrapWithKek(whServerContext* server,

/* Extract IV and authTag from wrappedDataIn */
memcpy(iv, wrappedDataIn, sizeof(iv));
memcpy(authTag, wrappedDataIn + sizeof(iv), sizeof(authTag));
memcpy(authTag, (const uint8_t*)wrappedDataIn + sizeof(iv), sizeof(authTag));

/* Decrypt the encrypted blob */
ret = wc_AesGcmDecrypt(aes, dataOut, encBlob, encBlobSz, iv, sizeof(iv),
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ DEF += -DWOLFHSM_CFG_TEST_POSIX
ARCHFLAGS ?=

# Enable extra C compiler warnings
CFLAGS_EXTRA = -Werror -Wall -Wextra
CFLAGS_EXTRA = -Werror -Wall -Wextra -Wpointer-arith
# Place functions / data into separate sections to allow unused code removal
CFLAGS_EXTRA += -ffunction-sections -fdata-sections
# Auto-generate header dependency files (.d) alongside object files
Expand Down
Loading