2020-03-10 / Kathy Yeh

1. modify ssl ca filepath

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -385,7 +385,7 @@ static int OCPP16Callback(struct lws *wsi, enum lws_callback_reasons reason, voi
 
 			lws_b64_encode_string(hash, 16, key_b64, sizeof(key_b64));// Sec-WebSocket-Key
 
-			DEBUG_OCPPMESSAGE_INFO("------------------Handshake: Client  START----------------\n");
+			DEBUG_OCPPMESSAGE_INFO("------------------Handshake: Client Request START----------------\n");
 			lws_hdr_copy(wsi, buf, sizeof(buf) - 1, _WSI_TOKEN_CLIENT_URI);
 			DEBUG_OCPPMESSAGE_INFO("GET %s  HTTP/1.1 \n", buf);
 
@@ -406,7 +406,7 @@ static int OCPP16Callback(struct lws *wsi, enum lws_callback_reasons reason, voi
 
 			DEBUG_OCPPMESSAGE_INFO("Sec-WebSocket-Version: %d\n", SPEC_LATEST_SUPPORTED);
 
-			DEBUG_OCPPMESSAGE_INFO("------------------Handshake: Client  END----------------\n");
+			DEBUG_OCPPMESSAGE_INFO("------------------Handshake: Client Request END----------------\n");
 
 			DEBUG_OCPPMESSAGE_INFO("------------------Handshake: Server response START----------------\n");
 
@@ -687,16 +687,15 @@ int ConnectWsServer()
 	ContextInfo.port = CONTEXT_PORT_NO_LISTEN;
 	ContextInfo.iface = NULL;
 	ContextInfo.ssl_private_key_password = NULL;
-	ContextInfo.ssl_cert_filepath = NULL;//"./ssl_key/client_cert.pem";//NULL;
-	ContextInfo.ssl_private_key_filepath = NULL;//"./ssl_key/client_key.pem";//NULL;//"./ssl_key/client_key.pem";//NULL;
-	ContextInfo.ssl_ca_filepath = "./cacert.pem";//"./ssl_key/cacert.pem";//"cacert.pem";//"./ssl_key/cacert.pem";//"/root/cacert.pem";
+	ContextInfo.ssl_cert_filepath = NULL;//"./ssl_key/client_cert.pem";
+	ContextInfo.ssl_private_key_filepath = NULL;//"./ssl_key/client_key.pem";
+	ContextInfo.ssl_ca_filepath = "./root/cacert.pem";
 	ContextInfo.ssl_cipher_list = NULL; //use default one
 	ContextInfo.gid = -1;
 	ContextInfo.uid = -1;
 	if(use_ssl)
 	{
 		ContextInfo.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT ;
-		//ContextInfo.options |= LWS_SERVER_OPTION_REDIRECT_HTTP_TO_HTTPS | LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT | LWS_SERVER_OPTION_DISABLE_IPV6 | LWS_SERVER_OPTION_PEER_CERT_NOT_REQUIRED | LWS_SERVER_OPTION_VALIDATE_UTF8 | LWS_SERVER_OPTION_SKIP_SERVER_CANONICAL_NAME;
 	}
 
 	ContextInfo.protocols = protocols;
@@ -717,13 +716,13 @@ int ConnectWsServer()
 	ConnInfo.context = context;
 
 	ConnInfo.address=(const char *)OcppHost;
-	 printf("\n ConnInfo.address=%s\n",ConnInfo.address);
+	printf("\n ConnInfo.address=%s\n",ConnInfo.address);
 
 	ConnInfo.port = GetOcppPort();
-  printf("\n ConnInfo.port=%d\n",ConnInfo.port);
+	printf("\n ConnInfo.port=%d\n",ConnInfo.port);
 	ConnInfo.path=(const char *)OcppPath;
 
-	 printf("\n ConnInfo.path=%s\n",ConnInfo.path);
+	printf("\n ConnInfo.path=%s\n",ConnInfo.path);
 	ConnInfo.host=ConnInfo.address;//lws_canonical_hostname(context);
 	ConnInfo.origin="origin";
 	ConnInfo.protocol = protocols[1].name;