niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround for stringop-overflow warning with GCC 10

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2020-07-30 14:10:39 +02:00
parent 8445394e2a
commit c261053186
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/security/builtin_plugins/cryptographic/src/crypto_transform.c
View file

@ -930,8 +930,9 @@ add_reader_specific_mac(
else else
{ {
uint32_t key_id = ddsrt_toBE4u(key_material->receiver_specific_key_id); uint32_t key_id = ddsrt_toBE4u(key_material->receiver_specific_key_id);
memcpy(footer->receiver_specific_macs._buffer[index].receiver_mac.data, hmac.data, CRYPTO_HMAC_SIZE); struct receiver_specific_mac *rcvmac = footer->receiver_specific_macs._buffer + index;
memcpy(footer->receiver_specific_macs._buffer[index].receiver_mac_key_id, &key_id, sizeof(key_id)); memcpy(rcvmac->receiver_mac.data, hmac.data, CRYPTO_HMAC_SIZE);
memcpy(rcvmac->receiver_mac_key_id, &key_id, sizeof(key_id));
footer->receiver_specific_macs._length = ddsrt_toBE4u(++index); footer->receiver_specific_macs._length = ddsrt_toBE4u(++index);
} }
} }
@ -1014,8 +1015,9 @@ add_receiver_specific_mac(
else else
{ {
uint32_t key_id = ddsrt_toBE4u(pp_key_material->local_P2P_key_material->receiver_specific_key_id); uint32_t key_id = ddsrt_toBE4u(pp_key_material->local_P2P_key_material->receiver_specific_key_id);
memcpy(footer->receiver_specific_macs._buffer[index].receiver_mac.data, hmac.data, CRYPTO_HMAC_SIZE); struct receiver_specific_mac *rcvmac = footer->receiver_specific_macs._buffer + index;
memcpy(footer->receiver_specific_macs._buffer[index].receiver_mac_key_id, &key_id, sizeof(key_id)); memcpy(rcvmac->receiver_mac.data, hmac.data, CRYPTO_HMAC_SIZE);
memcpy(rcvmac->receiver_mac_key_id, &key_id, sizeof(key_id));
footer->receiver_specific_macs._length = ddsrt_toBE4u(++index); footer->receiver_specific_macs._length = ddsrt_toBE4u(++index);
} }
} }