Release of version 1.1.2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c60782339e11c2f5722c352d3bb910b3671a5d21..721333516a019084608e9e9080352ecefbab3e02 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
 #Change Log
+## [1.1.2](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v1.1.2) (April 22,2016)
+
+Bugfixes/Improvements:
+  - Signature mismatch in MQTT library file fixed
+  - Makefiles have a protective target on the top to prevent accidental execution
+
 ## [1.1.1](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v1.1.1) (April  1,2016)
 
 Bugfixes/Improvements:

diff --git a/PortingGuide.md b/PortingGuide.md
index a00d5988a6199faff951ce649d4457f527763adb..bfd77c311087c2e5cdd5a4287abac06e494a9474 100644 (file)
--- a/PortingGuide.md
+++ b/PortingGuide.md
@@ -6,8 +6,8 @@ The scope of this document is to provide instructions to modify the provided sou
 ##Contents of the SDK
 
 The SDK ported for linux can be downloaded from the below links.
- * [OpenSSL](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_openssl-1.1.1.tar)
- * [mbedTLS from ARM](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_mbedtls-1.1.1.tar)
+ * [OpenSSL](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_openssl-1.1.2.tar)
+ * [mbedTLS from ARM](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_mbedtls-1.1.2.tar)
 
 The C-code files of this SDK are delivered via the following directory structure (see comment behind folder name for an explanation of its content).  
 

diff --git a/README.md b/README.md
index 7d36ae51bfbe0ed719fd28280082d8215a498562..7b62a8f3af9ba1d3f9c1a487b62c814e54263ea5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+##Note: Upgrade
+
+Makefiles in the samples folder had the executable bit set and could  potentially delete all files of the host machine if executed as a bash script. 
+More details could be found [here](https://github.com/aws/aws-iot-device-sdk-embedded-C/issues/14). Please upgrade to the latest version of the SDK. 
+
 ##Overview
 
 The AWS IoT device SDK for embedded C is a collection of C source files which can be used in embedded applications to securely connect to the [AWS IoT platform](http://docs.aws.amazon.com/iot/latest/developerguide/what-is-aws-iot.html). It includes transport clients **MQTT**, **TLS** implementations and examples for their use. It also supports AWS IoT specific features such as **Thing Shadow**. It is distributed in source form and intended to be built into customer firmware along with application code, other libraries and RTOS. For additional information about porting the Device SDK for embedded C onto additional platforms please refer to the [PortingGuide](https://github.com/aws/aws-iot-device-sdk-embedded-c/blob/master/PortingGuide.md/).
@@ -27,8 +32,8 @@ Ensure you understand the AWS IoT platform and create the necessary certificates
 
 In order to quickly get started with the AWS IoT platform, we have ported the SDK for POSIX type Operating Systems like Ubuntu, OS X and RHEL. The porting of the SDK happens at the TLS layer, and for the MQTT protocol. The SDK is configured for two TLS libraries and can be built out of the box with *GCC* using *make utility*. The tarballs can be downloaded from the below links.
 
-* [OpenSSL](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_openssl-1.1.1.tar)
-* [mbedTLS from ARM](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_mbedtls-1.1.1.tar)
+* [OpenSSL](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_openssl-1.1.2.tar)
+* [mbedTLS from ARM](https://s3.amazonaws.com/aws-iot-device-sdk-embedded-c/linux_mqtt_mbedtls-1.1.2.tar)
 
 ##Installation
 This section explains the individual steps to retrieve the necessary files and be able to build your first application using the AWS IoT device SDK for embedded C.
@@ -98,4 +103,4 @@ ShadowUpdateStatusCallback,
 pCallbackContext, 
 TIMEOUT_4SEC, 
 persistenSubscription);
-```
\ No newline at end of file
+```

diff --git a/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/aws_iot_mqtt_embedded_client_wrapper.c b/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/aws_iot_mqtt_embedded_client_wrapper.c
index b8ad55d81fe2c2c2217f38756b21029d34630766..97aa7187f23bc9e3ce98bdb6f57edbd4878c1fd6 100644 (file)
--- a/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/aws_iot_mqtt_embedded_client_wrapper.c
+++ b/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/aws_iot_mqtt_embedded_client_wrapper.c
@@ -163,7 +163,7 @@ IoT_Error_t aws_iot_mqtt_connect(MQTTConnectParams *pParams) {
        data.password.cstring = pParams->pPassword;
        data.will.topicName.cstring = (char*)pParams->will.pTopicName;
        data.will.message.cstring = (char*)pParams->will.pMessage;
-       data.will.qos = pParams->will.qos;
+       data.will.qos = (enum QoS)pParams->will.qos;
        data.will.retained = pParams->will.isRetained;
        data.keepAliveInterval = pParams->KeepAliveInterval_sec;
        data.cleansession = pParams->isCleansession;

diff --git a/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/platform_linux/mbedtls/network_mbedtls_wrapper.c b/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/platform_linux/mbedtls/network_mbedtls_wrapper.c
index 353048bd33290b04c26c56c33b55742a1d3f3cec..b75e27a11eac0c4c5afbbcdb97aa64b967a9ae92 100644 (file)
--- a/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/platform_linux/mbedtls/network_mbedtls_wrapper.c
+++ b/aws_iot_src/protocol/mqtt/aws_iot_embedded_client_wrapper/platform_linux/mbedtls/network_mbedtls_wrapper.c
@@ -81,7 +81,7 @@ int iot_tls_init(Network *pNetwork) {
        if ((ret_val = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *) pers,
                        strlen(pers))) != 0) {
                ERROR(" failed\n  ! mbedtls_ctr_drbg_seed returned -0x%x\n", -ret);
-               return ret;
+               return ret_val;
        } DEBUG("ok\n");
 
        pNetwork->my_socket = 0;

diff --git a/aws_iot_src/utils/aws_iot_version.h b/aws_iot_src/utils/aws_iot_version.h
index 9a782da5c48efc97bab6bbb8d8808ee82c01341b..862c5c083ba0d001e5cc5ecfd1ca7c3122a1f6f9 100644 (file)
--- a/aws_iot_src/utils/aws_iot_version.h
+++ b/aws_iot_src/utils/aws_iot_version.h
@@ -39,7 +39,7 @@
 /**
  * @brief PATCH version when backwards-compatible bug fixes are made.
  */
-#define VERSION_PATCH 1
+#define VERSION_PATCH 2
 /**
  * @brief TAG is an (optional) tag appended to the version if a more descriptive verion is needed.
  */

diff --git a/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.c b/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.h b/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTPacket.c b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTPacket.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTReturnCodes.h b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTReturnCodes.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribe.h b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribe.h
index 3707510a9d75b3c2a45ce60c7977120ad8aeb80f..f1dc9f4b95935a12041eea8c53eed47301c6b748 100644 (file)
--- a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribe.h
+++ b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribe.h
@@ -27,8 +27,8 @@
 
 DLLExport MQTTReturnCode MQTTSerialize_subscribe(unsigned char *buf, size_t buflen,
                                                  unsigned char dup, uint16_t packetid, uint32_t count,
-                                                 MQTTString topicFilters[], uint32_t requestedQoSs[],
-                                                 uint32_t *serialized_len);
+                                                 MQTTString topicFilters[], QoS requestedQoSs[], 
+                                                uint32_t *serialized_len);
 
 DLLExport MQTTReturnCode MQTTDeserialize_suback(uint16_t *packetid, uint32_t maxcount,
                                                 uint32_t *count, QoS grantedQoSs[],

diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribeClient.c b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTSubscribeClient.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTUnsubscribeClient.c b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTUnsubscribeClient.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/sample_apps/shadow_sample/ShadowLinuxMQTTMbedtlsMakefile.mk b/sample_apps/shadow_sample/ShadowLinuxMQTTMbedtlsMakefile.mk
index b69fbccf620e70872816e9f70da688a37dcd5815..136ebe9cbb7f48cccba239e1ec740e87327b55a0 100644 (file)
--- a/sample_apps/shadow_sample/ShadowLinuxMQTTMbedtlsMakefile.mk
+++ b/sample_apps/shadow_sample/ShadowLinuxMQTTMbedtlsMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -83,5 +87,5 @@ all:
        $(POST_MAKE_CMD)
 
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)
+       rm -f $(APP_DIR)/$(APP_NAME)
        $(MBED_TLS_MAKE_CMD) clean

diff --git a/sample_apps/shadow_sample/ShadowLinuxMQTTOpensslMakefile.mk b/sample_apps/shadow_sample/ShadowLinuxMQTTOpensslMakefile.mk
index 3ebe350dd159643d6ca73561ecdfdc203ef37192..19b788e57b82d1dccb4db65ab690f198a3e08f6c 100644 (file)
--- a/sample_apps/shadow_sample/ShadowLinuxMQTTOpensslMakefile.mk
+++ b/sample_apps/shadow_sample/ShadowLinuxMQTTOpensslMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -79,4 +83,4 @@ all:
        $(DEBUG)$(MAKE_CMD)
        
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)   
+       rm -f $(APP_DIR)/$(APP_NAME)    

diff --git a/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTMbedtlsMakefile.mk b/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTMbedtlsMakefile.mk
index 32127e24c09676c237eb02c774b81189522d41d3..7f3af6f01890b5605b9bc79e394f5ac75e6e416a 100644 (file)
--- a/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTMbedtlsMakefile.mk
+++ b/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTMbedtlsMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -84,5 +88,5 @@ all:
        $(POST_MAKE_CMD)
 
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)
+       rm -f $(APP_DIR)/$(APP_NAME)
        $(MBED_TLS_MAKE_CMD) clean

diff --git a/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTOpensslMakefile.mk b/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTOpensslMakefile.mk
index bdbb2356394f95a4db4430aa54fd6ee61ccc1f2f..b1903ce14fed41c1928dda18dda14dacabcab9ac 100644 (file)
--- a/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTOpensslMakefile.mk
+++ b/sample_apps/shadow_sample_console_echo/EchoLinuxMQTTOpensslMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -80,4 +84,4 @@ all:
        $(DEBUG)$(MAKE_CMD)
        
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)   
+       rm -f $(APP_DIR)/$(APP_NAME)    

diff --git a/sample_apps/subscribe_publish_sample/LinuxMQTTMbedtlsMakefile.mk b/sample_apps/subscribe_publish_sample/LinuxMQTTMbedtlsMakefile.mk
index 6b1eac0fb3c7b19a71beeae41ae8b5ef552d0735..b4117afbd5098b1eff4aeff4f2479ce27b93b861 100644 (file)
--- a/sample_apps/subscribe_publish_sample/LinuxMQTTMbedtlsMakefile.mk
+++ b/sample_apps/subscribe_publish_sample/LinuxMQTTMbedtlsMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -76,5 +80,5 @@ all:
        $(POST_MAKE_CMD)
 
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)
+       rm -f $(APP_DIR)/$(APP_NAME)
        $(MBED_TLS_MAKE_CMD) clean

diff --git a/sample_apps/subscribe_publish_sample/LinuxMQTTOpensslMakefile.mk b/sample_apps/subscribe_publish_sample/LinuxMQTTOpensslMakefile.mk
index 9b7b28c7cbd494dacaba3c9b103aa938ffb0cb34..87ac416f51a1db474dea30fb830824b175c8fdcc 100644 (file)
--- a/sample_apps/subscribe_publish_sample/LinuxMQTTOpensslMakefile.mk
+++ b/sample_apps/subscribe_publish_sample/LinuxMQTTOpensslMakefile.mk
@@ -1,3 +1,7 @@
+.prevent_execution:
+       exit 0
+#This target is to ensure accidental execution of Makefile as a bash script will not execute commands like rm in unexpected directories and exit gracefully.
+
 CC = gcc
 
 #remove @ for no make command prints
@@ -72,4 +76,4 @@ all:
        $(POST_MAKE_CMD)
        
 clean:
-       rm -rf $(APP_DIR)/$(APP_NAME)   
+       rm -f $(APP_DIR)/$(APP_NAME)