Skip to content

typos and topic lengths #11

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

Merged
merged 4 commits into from
Feb 8, 2022
Merged

typos and topic lengths #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d5b5ee
typos and topic lengths
danewalton-msft Feb 3, 2022
b47e1fd
add to other places
danewalton-msft Feb 4, 2022
66a5c89
patch up
danewalton-msft Feb 4, 2022
b59d45b
Merge branch 'main' into dane/topic
danewalton-msft Feb 4, 2022
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
14 changes: 7 additions & 7 deletions examples/Azure_IoT_Central_ESP32/AzureIoT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ log_function_t default_logging_function = NULL;
#define MQTT_USERNAME_BUFFER_SIZE 350
#define DECODED_SAS_KEY_BUFFER_SIZE 32
#define PLAIN_SAS_SIGNATURE_BUFFER_SIZE 256
#define SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE 32
#define SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE 32
#define SAS_SIGNATURE_BUFFER_SIZE 64
#define MQTT_PASSWORD_BUFFER_SIZE 512

Expand Down Expand Up @@ -316,7 +316,7 @@ void azure_iot_do_work(azure_iot_t* azure_iot)
return;
}

mqtt_message.topic = split_az_span(data_buffer, length, &data_buffer);
mqtt_message.topic = split_az_span(data_buffer, length + 1, &data_buffer);

if (is_az_span_empty(mqtt_message.topic) || is_az_span_empty(data_buffer))
{
Expand Down Expand Up @@ -395,7 +395,7 @@ void azure_iot_do_work(azure_iot_t* azure_iot)
return;
}

mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, length);
mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, length + 1);
mqtt_message.payload = AZ_SPAN_EMPTY;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -547,7 +547,7 @@ int azure_iot_send_telemetry(azure_iot_t* azure_iot, az_span message)
&azure_iot->iot_hub_client, NULL, (char*)az_span_ptr(azure_iot->data_buffer), az_span_size(azure_iot->data_buffer), &topic_length);
EXIT_IF_AZ_FAILED(azr, RESULT_ERROR, "Failed to get the telemetry topic");

mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, topic_length);
mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, topic_length + 1);
mqtt_message.payload = message;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -887,7 +887,7 @@ int azure_iot_send_command_response(azure_iot_t* azure_iot, az_span request_id,
(char*)az_span_ptr(mqtt_message.topic), az_span_size(mqtt_message.topic), &topic_length);
EXIT_IF_AZ_FAILED(azrc, RESULT_ERROR, "Failed to get the commands response topic.");

mqtt_message.topic = az_span_slice(mqtt_message.topic, 0, topic_length);
mqtt_message.topic = az_span_slice(mqtt_message.topic, 0, topic_length + 1);
mqtt_message.payload = payload;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -1111,7 +1111,7 @@ static int generate_sas_token_for_dps(
EXIT_IF_TRUE(result != 0, 0, "Failed decoding SAS key.");

// Step 2.c.
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
EXIT_IF_TRUE(is_az_span_empty(sas_hmac256_signed_signature), 0, "Failed reserving buffer for sas_hmac256_signed_signature.");

result = data_manipulation_functions.hmac_sha256_encrypt(
Expand Down Expand Up @@ -1202,7 +1202,7 @@ static int generate_sas_token_for_iot_hub(
EXIT_IF_TRUE(result != 0, 0, "Failed decoding SAS key.");

// Step 2.c.
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
EXIT_IF_TRUE(is_az_span_empty(sas_hmac256_signed_signature), 0, "Failed reserving buffer for sas_hmac256_signed_signature.");

result = data_manipulation_functions.hmac_sha256_encrypt(
Expand Down
14 changes: 7 additions & 7 deletions examples/Azure_IoT_Central_ESP32_AzureIoTKit/AzureIoT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ log_function_t default_logging_function = NULL;
#define MQTT_USERNAME_BUFFER_SIZE 350
#define DECODED_SAS_KEY_BUFFER_SIZE 32
#define PLAIN_SAS_SIGNATURE_BUFFER_SIZE 256
#define SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE 32
#define SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE 32
#define SAS_SIGNATURE_BUFFER_SIZE 64
#define MQTT_PASSWORD_BUFFER_SIZE 512

Expand Down Expand Up @@ -316,7 +316,7 @@ void azure_iot_do_work(azure_iot_t* azure_iot)
return;
}

mqtt_message.topic = split_az_span(data_buffer, length, &data_buffer);
mqtt_message.topic = split_az_span(data_buffer, length + 1, &data_buffer);

if (is_az_span_empty(mqtt_message.topic) || is_az_span_empty(data_buffer))
{
Expand Down Expand Up @@ -395,7 +395,7 @@ void azure_iot_do_work(azure_iot_t* azure_iot)
return;
}

mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, length);
mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, length + 1);
mqtt_message.payload = AZ_SPAN_EMPTY;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -547,7 +547,7 @@ int azure_iot_send_telemetry(azure_iot_t* azure_iot, az_span message)
&azure_iot->iot_hub_client, NULL, (char*)az_span_ptr(azure_iot->data_buffer), az_span_size(azure_iot->data_buffer), &topic_length);
EXIT_IF_AZ_FAILED(azr, RESULT_ERROR, "Failed to get the telemetry topic");

mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, topic_length);
mqtt_message.topic = az_span_slice(azure_iot->data_buffer, 0, topic_length + 1);
mqtt_message.payload = message;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -887,7 +887,7 @@ int azure_iot_send_command_response(azure_iot_t* azure_iot, az_span request_id,
(char*)az_span_ptr(mqtt_message.topic), az_span_size(mqtt_message.topic), &topic_length);
EXIT_IF_AZ_FAILED(azrc, RESULT_ERROR, "Failed to get the commands response topic.");

mqtt_message.topic = az_span_slice(mqtt_message.topic, 0, topic_length);
mqtt_message.topic = az_span_slice(mqtt_message.topic, 0, topic_length + 1);
mqtt_message.payload = payload;
mqtt_message.qos = mqtt_qos_at_most_once;

Expand Down Expand Up @@ -1111,7 +1111,7 @@ static int generate_sas_token_for_dps(
EXIT_IF_TRUE(result != 0, 0, "Failed decoding SAS key.");

// Step 2.c.
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
EXIT_IF_TRUE(is_az_span_empty(sas_hmac256_signed_signature), 0, "Failed reserving buffer for sas_hmac256_signed_signature.");

result = data_manipulation_functions.hmac_sha256_encrypt(
Expand Down Expand Up @@ -1202,7 +1202,7 @@ static int generate_sas_token_for_iot_hub(
EXIT_IF_TRUE(result != 0, 0, "Failed decoding SAS key.");

// Step 2.c.
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
sas_hmac256_signed_signature = split_az_span(data_buffer_span, SAS_HMAC256_ENCRYPTED_SIGNATURE_BUFFER_SIZE, &data_buffer_span);
EXIT_IF_TRUE(is_az_span_empty(sas_hmac256_signed_signature), 0, "Failed reserving buffer for sas_hmac256_signed_signature.");

result = data_manipulation_functions.hmac_sha256_encrypt(
Expand Down