Revision 13:80d8e97e81f2, committed 2017-01-16

Comitter:

mapellil

Date:

Mon Jan 16 13:26:50 2017 +0000

Parent:

12:0b4472769b08

Commit message:

Moved secure socket connection to the specific TLS_HelloWorld app

Changed in this revision

diff -r 0b4472769b08 -r 80d8e97e81f2 main.cpp
--- a/main.cpp	Fri Jan 13 15:31:35 2017 +0000
+++ b/main.cpp	Mon Jan 16 13:26:50 2017 +0000
@@ -18,27 +18,6 @@
 #include "SpwfInterface.h"
 #include "TCPSocket.h"
 
-//www.mbed.com CA certificate in PEM format
-char  CA_cert []="-----BEGIN CERTIFICATE-----\r\n"
-"MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT\r\n"
-"MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i\r\n"
-"YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG\r\n"
-"EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg\r\n"
-"R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9\r\n"
-"9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq\r\n"
-"fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv\r\n"
-"iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU\r\n"
-"1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+\r\n"
-"bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW\r\n"
-"MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA\r\n"
-"ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l\r\n"
-"uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn\r\n"
-"Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS\r\n"
-"tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF\r\n"
-"PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un\r\n"
-"hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV\r\n"
-"5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==\r\n"
-"-----END CERTIFICATE-----\r\n";
 
 
 //------------------------------------
@@ -126,40 +105,6 @@
     pc.printf("\r\nClosing Socket\r\n");
     socket.close();
     pc.printf("\r\nUnsecure Socket Test complete.\r\n");
-
-// Start Secure Socket connection test (one way server autentication only)   
-    time_t ctTime;
-    ctTime = time(NULL);             
-    printf ("Start Secure Socket connection with one way server autentication test\n\r");                
-    printf("Initial System Time is: %s\r\n", ctime(&ctTime));   
-    printf("Need to adjust time? if yes enter time in seconds elapsed since Epoch (cmd: date +'%%s'), otherwise enter 0 ");                
-    int t=0;
-    scanf("%d",&t);
-    printf ("entered time is: %d \n\r", t);
-    if (t != 0) { time_t txTm = t; set_time(txTm); }  // set Nucleo system time
-    ctTime = time(NULL);    
-    printf ("The current system time is: %s", ctime (&ctTime));  // set WiFi module systm time
-    if (!spwf.set_time(ctTime)) printf ("ERROR set_time\n\r");       
-    if (!spwf.clean_TLS_certificate(ALL)) printf ("ERROR clean_TLS_certificate\n\r");
-    if (!spwf.set_TLS_certificate(CA_cert, sizeof(CA_cert), FLASH_CA_ROOT_CERT)) printf ("ERROR set_TLS_certificate\n\r");
-    if (!spwf.set_TLS_SRV_domain("*.mbed.com",FLASH_DOMAIN)) printf ("ERROR set_TLS_CA_domain\n\r");
-// NOTE:  the Wifi API set_secure_mode() and set_unsecure_mode() refers to the whole interface so the socket must be created / opened after 
-// having set the desidered mode (deft unsecure).
-//#define SEC_MODE1 // two possible ways to secure connect a socket are shown 
-    spwf.gethostbyname(&addr,"www.mbed.com");  // ask DNS to resolve URL/IP 
-    addr.set_port(443);     
-    spwf.set_secure_mode();           
-    socket.open(&spwf);
-    spwf.set_unsecure_mode();    
-    printf ("Connecting to www.mbed.com IP: %s ...\n\r", addr.get_ip_address());
-#ifdef SEC_MODE1    
-    err = socket.connect(addr);
-#else
-    err = socket.connect("www.mbed.com", 443);
-#endif    
-    if (err != 0 )printf ("ERROR secure socket connection failed: %d\n\r", err);
-    else printf ("--->>> Secure socket CONNECTED to: %s\n\r", addr.get_ip_address());
-    socket.close();      
     printf ("Socket closed\n\r");
     spwf.disconnect();
     printf ("WIFI disconnected, exiting ...\n\r");