Microsoft Azure IoTHub client libraries
Dependents: sht15_remote_monitoring RobotArmDemo iothub_client_sample_amqp f767zi_mqtt ... more
This library implements the Microsoft Azure IoTHub client library. The code is replicated from https://github.com/Azure/azure-iot-sdks
Diff: iothub_client_authorization.c
- Revision:
- 88:248736be106e
- Parent:
- 79:bb88037c05e6
- Child:
- 89:a2ed767a532e
--- a/iothub_client_authorization.c Fri May 04 13:24:17 2018 -0700 +++ b/iothub_client_authorization.c Mon Jun 11 15:39:23 2018 -0700 @@ -13,10 +13,10 @@ #include "azure_c_shared_utility/shared_util_options.h" #ifdef USE_PROV_MODULE -#include "azure_prov_client/iothub_auth_client.h" +#include "azure_prov_client/internal/iothub_auth_client.h" #endif -#include "iothub_client_authorization.h" +#include "internal/iothub_client_authorization.h" #define DEFAULT_SAS_TOKEN_EXPIRY_TIME_SECS 3600 #define INDEFINITE_TIME ((time_t)(-1)) @@ -290,7 +290,7 @@ return result; } -char* IoTHubClient_Auth_Get_SasToken(IOTHUB_AUTHORIZATION_HANDLE handle, const char* scope, size_t expiry_time_relative_seconds) +char* IoTHubClient_Auth_Get_SasToken(IOTHUB_AUTHORIZATION_HANDLE handle, const char* scope, size_t expiry_time_relative_seconds, const char* key_name) { char* result; /* Codes_SRS_IoTHub_Authorization_07_009: [ if handle or scope are NULL, IoTHubClient_Auth_Get_SasToken shall return NULL. ] */ @@ -314,9 +314,11 @@ } else { + memset(&dev_auth_cred, 0, sizeof(DEVICE_AUTH_CREDENTIAL_INFO)); size_t expiry_time = sec_since_epoch+expiry_time_relative_seconds; dev_auth_cred.sas_info.expiry_seconds = expiry_time; dev_auth_cred.sas_info.token_scope = scope; + dev_auth_cred.sas_info.key_name = key_name; dev_auth_cred.dev_auth_type = AUTH_TYPE_SAS; CREDENTIAL_RESULT* cred_result = iothub_device_auth_generate_credentials(handle->device_auth_handle, &dev_auth_cred); @@ -367,7 +369,6 @@ } else { - const char* key_name = ""; STRING_HANDLE sas_token; size_t sec_since_epoch; @@ -489,8 +490,8 @@ } else { - /* Codes_SRS_IoTHub_Authorization_07_016: [ if credential type is not IOTHUB_CREDENTIAL_TYPE_SAS_TOKEN IoTHubClient_Auth_Is_SasToken_Valid shall return true. ] */ - result = true; + /* Codes_SRS_IoTHub_Authorization_07_016: [ if credential type is not IOTHUB_CREDENTIAL_TYPE_SAS_TOKEN IoTHubClient_Auth_Is_SasToken_Valid shall return SAS_TOKEN_STATUS_VALID. ] */ + result = SAS_TOKEN_STATUS_VALID; } } return result;