Release of version 1.1.2

bhadrip · bhadrip · commit d2ed84ce8695 · 2016-04-22T20:58:07.000Z
diff --git 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
@@ -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
@@ -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);
-```
+```
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
@@ -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
@@ -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
@@ -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
diff --git a/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.h b/aws_mqtt_embedded_client_lib/MQTTClient-C/src/MQTTClient.h
diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTPacket.c b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTPacket.c
diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTReturnCodes.h b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTReturnCodes.h
diff --git 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
diff --git a/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTUnsubscribeClient.c b/aws_mqtt_embedded_client_lib/MQTTPacket/src/MQTTUnsubscribeClient.c
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)	
