rename files, differentiating between sdk versions

Author: joostd

peap/user/user_main.c

@@ -0,0 +1,60 @@
+unsigned char ca[] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43,
+  0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x42, 0x77, 0x6a, 0x43, 0x43,
+  0x41, 0x57, 0x79, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x4a,
+  0x41, 0x4c, 0x6b, 0x2f, 0x63, 0x39, 0x6b, 0x2b, 0x49, 0x63, 0x6c, 0x61,
+  0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, 0x33,
+  0x44, 0x51, 0x45, 0x42, 0x42, 0x51, 0x55, 0x41, 0x4d, 0x43, 0x49, 0x78,
+  0x49, 0x44, 0x41, 0x65, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42, 0x41, 0x4d,
+  0x54, 0x46, 0x30, 0x4e, 0x6c, 0x63, 0x6e, 0x52, 0x70, 0x5a, 0x6d, 0x6c,
+  0x6a, 0x59, 0x58, 0x52, 0x70, 0x62, 0x32, 0x34, 0x67, 0x51, 0x58, 0x56,
+  0x30, 0x61, 0x47, 0x39, 0x79, 0x61, 0x58, 0x52, 0x35, 0x4d, 0x42, 0x34,
+  0x58, 0x44, 0x54, 0x45, 0x32, 0x4d, 0x44, 0x49, 0x78, 0x4d, 0x6a, 0x45,
+  0x31, 0x4e, 0x44, 0x49, 0x31, 0x4d, 0x56, 0x6f, 0x58, 0x44, 0x54, 0x45,
+  0x35, 0x0a, 0x4d, 0x44, 0x49, 0x78, 0x4d, 0x54, 0x45, 0x31, 0x4e, 0x44,
+  0x49, 0x31, 0x4d, 0x56, 0x6f, 0x77, 0x49, 0x6a, 0x45, 0x67, 0x4d, 0x42,
+  0x34, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x78, 0x4d, 0x58, 0x51, 0x32,
+  0x56, 0x79, 0x64, 0x47, 0x6c, 0x6d, 0x61, 0x57, 0x4e, 0x68, 0x64, 0x47,
+  0x6c, 0x76, 0x62, 0x69, 0x42, 0x42, 0x64, 0x58, 0x52, 0x6f, 0x62, 0x33,
+  0x4a, 0x70, 0x64, 0x48, 0x6b, 0x77, 0x0a, 0x58, 0x44, 0x41, 0x4e, 0x42,
+  0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41,
+  0x51, 0x45, 0x46, 0x41, 0x41, 0x4e, 0x4c, 0x41, 0x44, 0x42, 0x49, 0x41,
+  0x6b, 0x45, 0x41, 0x76, 0x4e, 0x6c, 0x46, 0x51, 0x62, 0x41, 0x64, 0x32,
+  0x47, 0x39, 0x61, 0x46, 0x79, 0x47, 0x71, 0x57, 0x4e, 0x45, 0x79, 0x61,
+  0x57, 0x72, 0x59, 0x4b, 0x75, 0x4d, 0x41, 0x39, 0x47, 0x51, 0x6f, 0x0a,
+  0x74, 0x77, 0x4f, 0x2f, 0x59, 0x31, 0x38, 0x73, 0x31, 0x6b, 0x73, 0x70,
+  0x2f, 0x32, 0x48, 0x36, 0x68, 0x65, 0x52, 0x62, 0x6a, 0x59, 0x37, 0x6a,
+  0x51, 0x6b, 0x71, 0x4d, 0x61, 0x72, 0x31, 0x33, 0x73, 0x6f, 0x47, 0x46,
+  0x35, 0x77, 0x6e, 0x51, 0x30, 0x44, 0x45, 0x48, 0x44, 0x2f, 0x54, 0x71,
+  0x79, 0x6f, 0x51, 0x6d, 0x77, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42,
+  0x6f, 0x34, 0x47, 0x45, 0x0a, 0x4d, 0x49, 0x47, 0x42, 0x4d, 0x42, 0x30,
+  0x47, 0x41, 0x31, 0x55, 0x64, 0x44, 0x67, 0x51, 0x57, 0x42, 0x42, 0x54,
+  0x69, 0x50, 0x46, 0x36, 0x6f, 0x53, 0x42, 0x71, 0x36, 0x65, 0x2f, 0x65,
+  0x57, 0x4c, 0x59, 0x79, 0x62, 0x59, 0x58, 0x78, 0x6f, 0x79, 0x4d, 0x6d,
+  0x34, 0x4b, 0x54, 0x42, 0x53, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x53, 0x4d,
+  0x45, 0x53, 0x7a, 0x42, 0x4a, 0x67, 0x42, 0x54, 0x69, 0x0a, 0x50, 0x46,
+  0x36, 0x6f, 0x53, 0x42, 0x71, 0x36, 0x65, 0x2f, 0x65, 0x57, 0x4c, 0x59,
+  0x79, 0x62, 0x59, 0x58, 0x78, 0x6f, 0x79, 0x4d, 0x6d, 0x34, 0x4b, 0x61,
+  0x45, 0x6d, 0x70, 0x43, 0x51, 0x77, 0x49, 0x6a, 0x45, 0x67, 0x4d, 0x42,
+  0x34, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x78, 0x4d, 0x58, 0x51, 0x32,
+  0x56, 0x79, 0x64, 0x47, 0x6c, 0x6d, 0x61, 0x57, 0x4e, 0x68, 0x64, 0x47,
+  0x6c, 0x76, 0x0a, 0x62, 0x69, 0x42, 0x42, 0x64, 0x58, 0x52, 0x6f, 0x62,
+  0x33, 0x4a, 0x70, 0x64, 0x48, 0x6d, 0x43, 0x43, 0x51, 0x43, 0x35, 0x50,
+  0x33, 0x50, 0x5a, 0x50, 0x69, 0x48, 0x4a, 0x57, 0x6a, 0x41, 0x4d, 0x42,
+  0x67, 0x4e, 0x56, 0x48, 0x52, 0x4d, 0x45, 0x42, 0x54, 0x41, 0x44, 0x41,
+  0x51, 0x48, 0x2f, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53,
+  0x49, 0x62, 0x33, 0x44, 0x51, 0x45, 0x42, 0x0a, 0x42, 0x51, 0x55, 0x41,
+  0x41, 0x30, 0x45, 0x41, 0x75, 0x59, 0x49, 0x4d, 0x4b, 0x4d, 0x68, 0x30,
+  0x4c, 0x39, 0x47, 0x44, 0x41, 0x63, 0x37, 0x74, 0x59, 0x55, 0x44, 0x5a,
+  0x49, 0x77, 0x38, 0x6d, 0x71, 0x45, 0x69, 0x38, 0x7a, 0x33, 0x6e, 0x6c,
+  0x33, 0x56, 0x5a, 0x4d, 0x57, 0x74, 0x56, 0x33, 0x4c, 0x39, 0x62, 0x64,
+  0x35, 0x46, 0x70, 0x53, 0x53, 0x74, 0x4f, 0x2b, 0x32, 0x50, 0x4c, 0x4e,
+  0x0a, 0x52, 0x34, 0x78, 0x70, 0x55, 0x53, 0x4c, 0x33, 0x57, 0x39, 0x65,
+  0x45, 0x4c, 0x49, 0x73, 0x69, 0x79, 0x52, 0x57, 0x32, 0x77, 0x53, 0x77,
+  0x78, 0x55, 0x6e, 0x7a, 0x73, 0x64, 0x51, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49,
+  0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+unsigned int ca_len = 672;
+

user/testuser_cert.c renamed to wpa2e-v15/testuser_cert.c

@@ -0,0 +1,77 @@
+#include "ets_sys.h"
+#include "osapi.h"
+#include "os_type.h"
+#include "gpio.h"
+#include "user_interface.h"
+
+#include "user_config.h"
+#include "ca.h"
+
+#define WIFI_LED_IO_MUX     PERIPHS_IO_MUX_GPIO2_U
+#define WIFI_LED_IO_NUM     2
+#define WIFI_LED_IO_FUNC    FUNC_GPIO2
+
+void wifi_handle_event_cb(System_Event_t *evt)
+{
+    switch (evt->event) {
+        case EVENT_STAMODE_CONNECTED:
+            os_printf("[connect to ssid %s, channel %d]\n",
+                evt->event_info.connected.ssid,
+                evt->event_info.connected.channel);
+            break;
+        case EVENT_STAMODE_DISCONNECTED:
+            os_printf("[disconnect from ssid %s, reason %d]\n",
+                evt->event_info.disconnected.ssid,
+                evt->event_info.disconnected.reason);
+            break;
+        case EVENT_STAMODE_AUTHMODE_CHANGE:
+            os_printf("[mode: %d -> %d]\n",
+                evt->event_info.auth_change.old_mode,
+                evt->event_info.auth_change.new_mode);
+            break;
+        case EVENT_STAMODE_GOT_IP:
+            os_printf("[ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR "]\n",
+                IP2STR(&evt->event_info.got_ip.ip),
+                IP2STR(&evt->event_info.got_ip.mask),
+                IP2STR(&evt->event_info.got_ip.gw));
+            break;
+        default:
+            os_printf("[event: %x]\n", evt->event);
+            break;
+    }
+}
+
+void ICACHE_FLASH_ATTR user_init(void)
+{
+    struct station_config wifi_config;
+
+    uart_div_modify(0, UART_CLK_FREQ/9600);
+    os_delay_us(1000000);
+
+    wifi_status_led_install(WIFI_LED_IO_NUM, WIFI_LED_IO_MUX, FUNC_GPIO0); 
+    os_printf("[SDK version:%s]\n", system_get_sdk_version());
+
+    // station mode: 
+    if( !wifi_set_opmode(STATION_MODE) ) {
+        os_printf("[failed setting station mode]\n");
+    }
+
+    // set station configuration, save to flash
+    os_memset(&wifi_config,0,sizeof(wifi_config));
+    os_strcpy(wifi_config.ssid, SSID, os_strlen(SSID));
+    //os_strcpy(wifi_config.password, PSK, os_strlen(PSK));	// only for WPA2-PSK
+    os_strcpy(wifi_config.password, "", os_strlen(""));	// only for WPA2-Enterprise
+    wifi_station_set_config(&wifi_config);
+
+    // WPA2-Enterprise
+    wifi_station_set_wpa2_enterprise_auth(1);
+    // ignore CA Certificate when testing
+    wifi_station_set_enterprise_ca_cert(ca_pem, ca_pem_len + 1);
+    wifi_station_set_enterprise_username("espressif", os_strlen("espressif"));
+    wifi_station_set_enterprise_password("test11", os_strlen("test11"));
+
+    // no need to call connect() in user_init()
+    //if( !wifi_station_connect() );
+
+    wifi_set_event_handler_cb(wifi_handle_event_cb);
+}

user/testuser_key.c renamed to wpa2e-v15/testuser_key.c

@@ -1,4 +1,4 @@
-all: demoCA demoCA/cacert.pem testuser_cert.pem server_cert.pem testuser_key.c testuser_cert.c
+all: demoCA demoCA/cacert.pem testuser_cert.pem server_cert.pem testuser_key.c testuser_cert.c ca.h
 
 # Certification Authority
 
@@ -48,6 +48,14 @@ testuser_key.c: testuser_key.pem
 	xxd -i testuser_key.pem > testuser_key.c
 testuser_cert.c: testuser_cert.pem
 	xxd -i testuser_cert.pem > testuser_cert.c
+
+# C version of ca cert
+
+ca.pem: demoCA/cacert.pem
+	openssl x509 -in demoCA/cacert.pem -out ca.pem
+
+ca.h: ca.pem
+	xxd -i ca.pem > ca.h
 #
 
 clean: