Revision 3:56af709c24e1, committed 2017-04-04

Comitter:

jhamel

Date:

Tue Apr 04 16:29:57 2017 +0200

Parent:

2:5174125ed02d

Commit message:

Use CA from Symantec/VeriSign, and fix TLS issue

Changed in this revision

diff -r 5174125ed02d -r 56af709c24e1 liveobjects_dev_security.h
--- a/liveobjects_dev_security.h	Fri Dec 02 15:00:46 2016 +0100
+++ b/liveobjects_dev_security.h	Tue Apr 04 16:29:57 2017 +0200
@@ -19,30 +19,49 @@
 
 #define VERIFY_MODE   0
 
-//#define SERVER_CERT          NULL
+//#define SERVER_CERT           NULL
 #define CLIENT_CERT           NULL
 #define CLIENT_PKEY           NULL
 #define CLIENT_PKEY_PASSWORD  0
 
-#define SERVER_CERTIFICATE_COMMON_NAME     "m2m.orange.com"
+#ifdef SERVER_CERT
+
+#define SERVER_CERTIFICATE_COMMON_NAME     NULL
+
+#else
 
-#ifndef SERVER_CERT
+#define SERVER_CERTIFICATE_COMMON_NAME     "liveobjects.orange-business.com"
 
+/*
+ * see https://knowledge.symantec.com/support/mpki-for-ssl-support/index?page=content&actp=CROSSLINK&id=SO5624
+ */
 const char SERVER_CERT[] = "-----BEGIN CERTIFICATE-----\n"
-        "MIICkzCCAfygAwIBAgIBFzANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJGUjEN\n"
-        "MAsGA1UECAwETHlvbjEPMA0GA1UECgwGT3JhbmdlMQwwCgYDVQQLDANPQUIxIDAe\n"
-        "BgNVBAMMF0dyb3VwZSBPcmFuZ2UgSWFlcyBDQSAxMB4XDTE1MTEyMzA5MjAxMFoX\n"
-        "DTM1MTExODA5MjAxMFowXTELMAkGA1UEBhMCRlIxDTALBgNVBAgMBEx5b24xDzAN\n"
-        "BgNVBAoMBk9yYW5nZTEMMAoGA1UECwwDT0FCMSAwHgYDVQQDDBdHcm91cGUgT3Jh\n"
-        "bmdlIElhZXMgQ0EgMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlsdFGeMj\n"
-        "4b4jS4JNscoplDWR9WaZX8lYHOjp0axIEQXTusOBvk22YofY5Tnv0x78S+wRuOH5\n"
-        "qgLPXClpshg8WtX2iwcvH0VxYfHIutZ1Whl4delpC5oiMs/Sa5h5VoBxEYu9EpCg\n"
-        "7EZc292xFoVFTQY/wUAgPKFbUdthDz9J/JECAwEAAaNjMGEwHQYDVR0OBBYEFFyA\n"
-        "eJlmSmyL24lhK5/fDoS6tdv5MB8GA1UdIwQYMBaAFFyAeJlmSmyL24lhK5/fDoS6\n"
-        "tdv5MBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEB\n"
-        "BQUAA4GBADvFP7F3vfpX6MP24XO4OE7JK5qa0CjC2Mt45YgzH9QtaHruSNPuoNJD\n"
-        "wspRAvBRkq2kJAl3KGuC3zSfP4VTCa4PX1w+pPU5OpSWxfgt1LauP/BRcxcrEqmF\n"
-        "hvj7auQ4LM2NkuLqxqernaKnocYMiwbgq/PlUtOYd6gZtehj6uSw\n"
+		"MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB\n"
+		"yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL\n"
+		"ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp\n"
+		"U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW\n"
+		"ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0\n"
+		"aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL\n"
+		"MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW\n"
+		"ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln\n"
+		"biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp\n"
+		"U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y\n"
+		"aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1\n"
+		"nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex\n"
+		"t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz\n"
+		"SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG\n"
+		"BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+\n"
+		"rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/\n"
+		"NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E\n"
+		"BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH\n"
+		"BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy\n"
+		"aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv\n"
+		"MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE\n"
+		"p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y\n"
+		"5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK\n"
+		"WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ\n"
+		"4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N\n"
+		"hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq\n"
         "-----END CERTIFICATE-----\n";
 #endif
 

diff -r 5174125ed02d -r 56af709c24e1 main.cpp
--- a/main.cpp	Fri Dec 02 15:00:46 2016 +0100
+++ b/main.cpp	Tue Apr 04 16:29:57 2017 +0200
@@ -27,7 +27,7 @@
 #include "rtos.h"
 
 
-static const char* appv_version = "MBED GREENHOUSE DEMO V02.01";
+static const char* appv_version = "MBED GREENHOUSE DEMO V04.01";
 
 #if 0
 #define DBG_DFT_MAIN_LOG_LEVEL    3
@@ -1169,7 +1169,7 @@
 
             appv_hdl_states = LiveObjectsClient_AttachData(STREAM_PREFIX,
                     appv_conf.stream_states,"mv1",NULL, &greenhouse_gps_fix, appv_set_states, SET_DATA_STATES_NB);
-            if (appv_hdl_states < 0) output.printf(" !!! ERROR (%d) to attach a collected data stream -  STATES !\r\n", appv_hdl_leds);
+            if (appv_hdl_states < 0) output.printf(" !!! ERROR (%d) to attach a collected data stream -  STATES !\r\n", appv_hdl_states);
 
             // Attach a set of commands to the LiveObjects Client instance
             // -----------------------------------------------------------

diff -r 5174125ed02d -r 56af709c24e1 mbedtls_configs/liveobjects_mbedtls_custom_config.h
--- a/mbedtls_configs/liveobjects_mbedtls_custom_config.h	Fri Dec 02 15:00:46 2016 +0100
+++ b/mbedtls_configs/liveobjects_mbedtls_custom_config.h	Tue Apr 04 16:29:57 2017 +0200
@@ -124,7 +124,7 @@
 #define MBEDTLS_BASE64_C
 
 // Reduce IO buffer to save RAM, default is 16KB
-#define MBEDTLS_SSL_MAX_CONTENT_LEN 2048
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (3*1024)
 
 // define to save 8KB RAM at the expense of ROM
 #undef MBEDTLS_AES_ROM_TABLES