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

Remove built-in crypto plugin unused variables

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-02-24 13:12:39 +01:00 • committed by eboasson
parent e0a9beb3cb
commit 0d5a8bf461
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1082,7 +1082,6 @@ encode_datawriter_submessage_encrypt (
struct submsg_header *prefix; struct submsg_header *prefix;
struct crypto_header *header; struct crypto_header *header;
struct submsg_header *postfix; struct submsg_header *postfix;
struct submsg_header *body;
struct crypto_footer *footer; struct crypto_footer *footer;
uint32_t transform_kind, transform_id; uint32_t transform_kind, transform_id;
DDS_Security_boolean result = false; DDS_Security_boolean result = false;
@ -1147,7 +1146,7 @@ encode_datawriter_submessage_encrypt (
goto enc_dw_submsg_fail; goto enc_dw_submsg_fail;
/* add SEC_BODY submessage */ /* add SEC_BODY submessage */
body = add_submessage(&data, SMID_SEC_BODY_KIND, flags, submsg_len); struct submsg_header *body = add_submessage(&data, SMID_SEC_BODY_KIND, flags, submsg_len);
encrypted = (struct encrypted_data *)(body + 1); encrypted = (struct encrypted_data *)(body + 1);
contents = encrypted->data; contents = encrypted->data;
@ -1171,7 +1170,6 @@ encode_datawriter_submessage_encrypt (
goto enc_dw_submsg_fail; goto enc_dw_submsg_fail;
/* copy submessage */ /* copy submessage */
body = (struct submsg_header *)contents;
memcpy(contents, plain_submsg->_buffer, plain_submsg->_length); memcpy(contents, plain_submsg->_buffer, plain_submsg->_length);
payload_len = plain_submsg->_length; payload_len = plain_submsg->_length;
data._length += payload_len; data._length += payload_len;
@ -1319,7 +1317,6 @@ encode_datareader_submessage(
struct submsg_header *prefix; struct submsg_header *prefix;
struct crypto_header *header; struct crypto_header *header;
struct submsg_header *postfix; struct submsg_header *postfix;
struct submsg_header *body;
struct crypto_footer *footer; struct crypto_footer *footer;
session_key_material *session = NULL; session_key_material *session = NULL;
DDS_Security_ProtectionKind protection_kind; DDS_Security_ProtectionKind protection_kind;
@ -1404,7 +1401,7 @@ encode_datareader_submessage(
goto enc_dr_submsg_fail; goto enc_dr_submsg_fail;
/* add SEC_BODY submessage */ /* add SEC_BODY submessage */
body = add_submessage(&data, SMID_SEC_BODY_KIND, flags, submsg_len); struct submsg_header *body = add_submessage(&data, SMID_SEC_BODY_KIND, flags, submsg_len);
encrypted = (struct encrypted_data *)(body + 1); encrypted = (struct encrypted_data *)(body + 1);
contents = encrypted->data; contents = encrypted->data;
@ -1428,7 +1425,6 @@ encode_datareader_submessage(
goto enc_dr_submsg_fail; goto enc_dr_submsg_fail;
/* copy submessage */ /* copy submessage */
body = (struct submsg_header *)contents;
memcpy(contents, plain_submsg->_buffer, plain_submsg->_length); memcpy(contents, plain_submsg->_buffer, plain_submsg->_length);
payload_len = plain_submsg->_length; payload_len = plain_submsg->_length;
data._length += payload_len; data._length += payload_len;
@ -1540,8 +1536,6 @@ static DDS_Security_boolean encode_rtps_message_sign (
DDS_Security_SecurityException *ex DDS_Security_SecurityException *ex
) )
{ {
size_t length_to_postfix, remaining = encoded_rtps_message->_length;
unsigned char *ptr;
DDS_Security_boolean result; DDS_Security_boolean result;
struct submsg_header *prefix = (struct submsg_header *)(encoded_rtps_message->_buffer + RTPS_HEADER_SIZE); struct submsg_header *prefix = (struct submsg_header *)(encoded_rtps_message->_buffer + RTPS_HEADER_SIZE);
struct crypto_header *header = (struct crypto_header *)(prefix + 1); struct crypto_header *header = (struct crypto_header *)(prefix + 1);
@ -1551,13 +1545,13 @@ static DDS_Security_boolean encode_rtps_message_sign (
if (submessage_header->id == SMID_SRTPS_INFO_SRC_KIND) /* not encrypted */ if (submessage_header->id == SMID_SRTPS_INFO_SRC_KIND) /* not encrypted */
{ {
/* skip INFO_SRC_HDR to RTPS submessage header */ /* skip INFO_SRC_HDR to RTPS submessage header */
ptr = ((unsigned char *)submessage_header + sizeof(struct submsg_header) + submessage_header->length); unsigned char *ptr = ((unsigned char *)submessage_header + sizeof(struct submsg_header) + submessage_header->length);
remaining = (size_t) (encoded_rtps_message->_buffer + encoded_rtps_message->_length - ptr); size_t remaining = (size_t) (encoded_rtps_message->_buffer + encoded_rtps_message->_length - ptr);
/* There may be multiple RTPS submessages until postfix */ /* There may be multiple RTPS submessages until postfix */
while (remaining - sizeof(struct submsg_header) > 0) while (remaining - sizeof(struct submsg_header) > 0)
{ {
submessage_header = (struct submsg_header *)ptr; submessage_header = (struct submsg_header *)ptr;
length_to_postfix = submessage_header->length + sizeof(struct submsg_header); size_t length_to_postfix = submessage_header->length + sizeof(struct submsg_header);
postfix = (struct submsg_header *)(((unsigned char *)submessage_header) + length_to_postfix); postfix = (struct submsg_header *)(((unsigned char *)submessage_header) + length_to_postfix);
if (postfix->id == SMID_SRTPS_POSTFIX_KIND) if (postfix->id == SMID_SRTPS_POSTFIX_KIND)
break; break;