2019-09-02 / ct_chen

Actions:
1. add and modify web page
2. add files about SSL
3. modify path of define.h in tool.c

Files:
1. EVSE/rootfs/var/www/*
2. EVSE/rootfs/etc/lighttpd/lighttpd.conf
   EVSE/rootfs/etc/lighttpd/conf.d/ssl.conf
   EVSE/rootfs/etc/lighttpd/ssl/*
3. EVSE/Modularization/tool.c

EVSE/Modularization/tool.c

@@ -26,7 +26,7 @@
 #include	<time.h>
 #include	<ctype.h>
 #include 	<ifaddrs.h>
-#include	"../../define.h"
+#include	"../Projects/define.h"
 
 #include <math.h>
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)

EVSE/rootfs/etc/lighttpd/conf.d/ssl.conf

@@ -0,0 +1,9 @@
+# /usr/share/doc/lighttpd/ssl.txt
+
+$SERVER["socket"] == ":443" {
+	ssl.engine  = "enable"
+	ssl.pemfile = "/etc/lighttpd/ssl/lighttpd.pem"
+
+	ssl.cipher-list = "ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM"
+	ssl.honor-cipher-order = "enable"
+}

EVSE/rootfs/etc/lighttpd/lighttpd.conf

@@ -7,7 +7,7 @@ var.vhosts_dir                  = server_root + "/vhosts"
 var.cache_dir                   = "/var/cache/lighttpd"
 var.socket_dir                  = home_dir + "/sockets"
 
-server.port                     = 80
+server.port                     = 443 
 server.username                 = "root"
 server.groupname                = "root"
 server.document-root            = server_root + "/"
@@ -20,6 +20,11 @@ server.max-connections          = 1024
 server.follow-symlink           = "enable"
 server.upload-dirs              = ( "/var/tmp" )
 
+ssl.engine = "enable"
+ssl.pemfile = "/etc/lighttpd/ssl/lighttpd.pem"
+#ssl.pemfile = "/etc/lighttpd/ssl/server.pem"
+#ssl.privkey= "/etc/lighttpd/ssl/privkey.pem"
+
 index-file.names                += ( "index.xhtml", "index.html", "index.htm", "default.htm", "index.php" )
 url.access-deny                 = ( "~", ".inc" )
 static-file.exclude-extensions  = ( ".php", ".pl", ".fcgi" )
@@ -29,4 +34,4 @@ include "conf.d/mime.conf"
 include "conf.d/dirlisting.conf"
 include "conf.d/access_log.conf"
 include "conf.d/debug.conf"
-
+include "conf.d/ssl.conf"

EVSE/rootfs/etc/lighttpd/ssl/cacert.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBzCCAu+gAwIBAgIJAPmkcIpFDT1KMA0GCSqGSIb3DQEBCwUAMIGZMQswCQYD
+VQQGEwJUVzEPMA0GA1UECAwGVGFpd2FuMRAwDgYDVQQHDAdUYW95dWFuMRAwDgYD
+VQQKDAdQaGlob25nMQ0wCwYDVQQLDARFVlNFMRkwFwYDVQQDDBAqLnBoaWhvbmcu
+Y29tLnR3MSswKQYJKoZIhvcNAQkBFhxzeXMtZXZjaGFyZ2VyQHBoaWhvbmcuY29t
+LnR3MB4XDTE5MDgzMDA3Mjk0MFoXDTI5MDgyNzA3Mjk0MFowgZkxCzAJBgNVBAYT
+AlRXMQ8wDQYDVQQIDAZUYWl3YW4xEDAOBgNVBAcMB1Rhb3l1YW4xEDAOBgNVBAoM
+B1BoaWhvbmcxDTALBgNVBAsMBEVWU0UxGTAXBgNVBAMMECoucGhpaG9uZy5jb20u
+dHcxKzApBgkqhkiG9w0BCQEWHHN5cy1ldmNoYXJnZXJAcGhpaG9uZy5jb20udHcw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJYDpc/M1s5T7F6qVSjvoq
+an8IeQWK4jR0w95LHzc/sb+MnROsmAOGBJ69B7JpZpfO2oftSEPxK+U3tPJ2BKym
+Sapeg+QJrhsqcCQPD97CnYiOI8OahFivdBebvpohN4eXhXH89h9m2S+Si4oLwZEm
+rJzSd6V6GLKhxPKNzzPEk9loNsWOUdTduJ2TrGB9Gzg3IM0p7t2UBPgusw2ilIPp
+8BF4lU4Yz941eFT32Wfzao22jlLwsGfAEs29co8NUbVWk8b2LuRTzWYm9vxNhMzi
+ibkEyRK0LBISdesPoTqViAPXkreIE4XqZvDMszJGEwHVnYhugBWoSYEEVxzuF49R
+AgMBAAGjUDBOMB0GA1UdDgQWBBRoiXFG4sTNToCpKZ0j7sr8lRMavjAfBgNVHSME
+GDAWgBRoiXFG4sTNToCpKZ0j7sr8lRMavjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQDDBDy7+H+Mf4Sr387LNs53GffAUrspehsaoaGGVcczNSHhGc4B
+TBTGyNpINJBasm9tlWyAI4p5dMC+o/KNhyiUslTD61aJIy5H4mw8eiDWpkqRkruS
++Rgyl0TzDxjlV41JGH+BlDLkENi1ku/ei6dqNv9HF7Y29kLyoHuy9Ff3ERWcQ5sl
+qHZg7ylRjwpI92EyF4vKKB2RXKjz7DAMF/cVgQujzsfwYwxvVP1pELPRpfe+0G+D
+gvhGawqM2cGyF9goyDiZjIKxiPdT9uAppbJtZ4mh6yQzFMvgk2cDqC6g4HWhQwgP
+eIGAg3a2rBKmkU90+Yj7dVSQmMxPi21/XWvY
+-----END CERTIFICATE-----

EVSE/rootfs/etc/lighttpd/ssl/cert.csr

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC3zCCAccCAQAwgZkxCzAJBgNVBAYTAlRXMQ8wDQYDVQQIDAZUYWl3YW4xEDAO
+BgNVBAcMB1Rhb3l1YW4xEDAOBgNVBAoMB1BoaWhvbmcxDTALBgNVBAsMBEVWU0Ux
+GTAXBgNVBAMMECoucGhpaG9uZy5jb20udHcxKzApBgkqhkiG9w0BCQEWHHN5cy1l
+dmNoYXJnZXJAcGhpaG9uZy5jb20udHcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDJYDpc/M1s5T7F6qVSjvoqan8IeQWK4jR0w95LHzc/sb+MnROsmAOG
+BJ69B7JpZpfO2oftSEPxK+U3tPJ2BKymSapeg+QJrhsqcCQPD97CnYiOI8OahFiv
+dBebvpohN4eXhXH89h9m2S+Si4oLwZEmrJzSd6V6GLKhxPKNzzPEk9loNsWOUdTd
+uJ2TrGB9Gzg3IM0p7t2UBPgusw2ilIPp8BF4lU4Yz941eFT32Wfzao22jlLwsGfA
+Es29co8NUbVWk8b2LuRTzWYm9vxNhMziibkEyRK0LBISdesPoTqViAPXkreIE4Xq
+ZvDMszJGEwHVnYhugBWoSYEEVxzuF49RAgMBAAGgADANBgkqhkiG9w0BAQsFAAOC
+AQEAGzl1ZSaRYg6ej3F2+ktFFyCIQfSzU+Am2wL3gceIhSSh856IzCvYbRYqJp+R
+2CMMFiAvoT0eetlgPbyq/lntHxRijE0KF3GN1KudQ3eaepQMdtg0UA1qgVwP+xGw
+ILVKyL1D6RE3BstBcSA6sktdU2u5oAG3zjFc9GmlsCyTmh0oI7gLWODzsyQuY5lL
+XSOUD+LL+B2Uul1wk5KLSBL1hC3n68NCtx0Qi8cp4G59nHW1g1tzDHO6Qzjm2Eta
+pB7zp3moEKTPrke9KiGzucIAy1Opb3/sPZ3yKS0jhN8zJOiMyRF2AqThyJQMcOAD
+6ykQK1ntCtOLLqp5T+zAwND5Aw==
+-----END CERTIFICATE REQUEST-----

EVSE/rootfs/etc/lighttpd/ssl/lighttpd.pem

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyWA6XPzNbOU+xeqlUo76Kmp/CHkFiuI0dMPeSx83P7G/jJ0T
+rJgDhgSevQeyaWaXztqH7UhD8SvlN7TydgSspkmqXoPkCa4bKnAkDw/ewp2IjiPD
+moRYr3QXm76aITeHl4Vx/PYfZtkvkouKC8GRJqyc0nelehiyocTyjc8zxJPZaDbF
+jlHU3bidk6xgfRs4NyDNKe7dlAT4LrMNopSD6fAReJVOGM/eNXhU99ln82qNto5S
+8LBnwBLNvXKPDVG1VpPG9i7kU81mJvb8TYTM4om5BMkStCwSEnXrD6E6lYgD15K3
+iBOF6mbwzLMyRhMB1Z2IboAVqEmBBFcc7hePUQIDAQABAoIBAQCPShqdWgEuUD0H
+hXyXr0cQ8XBs7fhkp6rdvxWo7JBakTcUbhy2vgAb16PAK/7mgurYdKUt0TMPI8XZ
+irbQBWl4dYh18nFL9gg8fUkbMpa2cnPdeFNR2oRkbD30Q37WzfV8eqbucY9MlpQE
+OahDzztigoagOCSWKYbKFyLkhyB16d8HXdD7PQbruQaO+GK7xAyiFyebe1Sh2Yl5
+NFzBmL0W7mLlP8k4cgnpwtSznWntEbXP3hZfVV8654lF8igXFxfUqhf2XYRHZbNp
+SttnPikJtJDJNmJYiaOLSklbVoPTi6dyefmhyKTmqwM+PfN1NIPznvuPeyjF/Mi6
+jitDacRxAoGBAOqxU4tVQP03Mv5G3Kyj7J7VF0jELSoKnU7U535Ynq1GAQ4dNicV
+7gYkE+E6+edHbf26tXt2u5cKktEipQVSIPkbgg8caWFLMA6wyxSkVfgSkv5Gc6S7
+V7jkiUjLTEQGYcJ0qF3V1Mvmn2QurwtiAmOsk6wb06a/4XD75n7j23V1AoGBANuo
+j3bNGa4NFJJk0s+yWAFtkRB8KQyfR8Ut6V5uV9jqNyBdyfT4uvmjbhyD8GLJ84K3
+sXq7RLQSxVNqb73BaL8yTXhHGISG/hZVB2On1boSqPcsz/6WQGEUVRlLzdV4+r/x
+02iO4m+Zuv1JMx4jtPSy492YEIk64sOPV/9FGErtAoGAAdn2Q8Ifah/2WgUrFn2Q
+j0w1C9DoXk2JIicR0HBYiBtmRLs8QyCsKQY91egGMqngl0DSz6+HGVDvCZFRZfJY
+6j4qT3404pyaO3NvlrEZMITM/g6GOQV1UrMS1i0sY9j9CnCrJ1pZfGZMWZj4rolO
+ZYTmAVSS3dzjpWWHUvbvM0UCgYA6wTmus2ndDo6kIefpunCj4STeXfe08p4F9iPo
+KGfDE9MvCydMKYQJ5lc7tWcFZbOHEY+dnp3f9O1nRJ8jCKr2CYSDWbELMfihDJlv
+ZKNcpEUh6JCyLoqF7SReIdKq+TNJSGweGaoj4+EKgxvzQeXTVk5xJY22x1OEr8D/
+/QFkeQKBgATsb126LOPovDCeZMf8/VoIAqsQBysj2A33cDc8fM13Yf624CJ5eJAH
+HICyD5pDF0VuqwfLs0KnWbuwegwAwZFvIJift+/UgIIamCu4ig+kBbnDCZLrbkBc
+GtMcRJQXZls1Me+V0XFRxjk9/8vxV2bfqI++o5DDWIMnoCIKujuH
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEBzCCAu+gAwIBAgIJAPmkcIpFDT1KMA0GCSqGSIb3DQEBCwUAMIGZMQswCQYD
+VQQGEwJUVzEPMA0GA1UECAwGVGFpd2FuMRAwDgYDVQQHDAdUYW95dWFuMRAwDgYD
+VQQKDAdQaGlob25nMQ0wCwYDVQQLDARFVlNFMRkwFwYDVQQDDBAqLnBoaWhvbmcu
+Y29tLnR3MSswKQYJKoZIhvcNAQkBFhxzeXMtZXZjaGFyZ2VyQHBoaWhvbmcuY29t
+LnR3MB4XDTE5MDgzMDA3Mjk0MFoXDTI5MDgyNzA3Mjk0MFowgZkxCzAJBgNVBAYT
+AlRXMQ8wDQYDVQQIDAZUYWl3YW4xEDAOBgNVBAcMB1Rhb3l1YW4xEDAOBgNVBAoM
+B1BoaWhvbmcxDTALBgNVBAsMBEVWU0UxGTAXBgNVBAMMECoucGhpaG9uZy5jb20u
+dHcxKzApBgkqhkiG9w0BCQEWHHN5cy1ldmNoYXJnZXJAcGhpaG9uZy5jb20udHcw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJYDpc/M1s5T7F6qVSjvoq
+an8IeQWK4jR0w95LHzc/sb+MnROsmAOGBJ69B7JpZpfO2oftSEPxK+U3tPJ2BKym
+Sapeg+QJrhsqcCQPD97CnYiOI8OahFivdBebvpohN4eXhXH89h9m2S+Si4oLwZEm
+rJzSd6V6GLKhxPKNzzPEk9loNsWOUdTduJ2TrGB9Gzg3IM0p7t2UBPgusw2ilIPp
+8BF4lU4Yz941eFT32Wfzao22jlLwsGfAEs29co8NUbVWk8b2LuRTzWYm9vxNhMzi
+ibkEyRK0LBISdesPoTqViAPXkreIE4XqZvDMszJGEwHVnYhugBWoSYEEVxzuF49R
+AgMBAAGjUDBOMB0GA1UdDgQWBBRoiXFG4sTNToCpKZ0j7sr8lRMavjAfBgNVHSME
+GDAWgBRoiXFG4sTNToCpKZ0j7sr8lRMavjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQDDBDy7+H+Mf4Sr387LNs53GffAUrspehsaoaGGVcczNSHhGc4B
+TBTGyNpINJBasm9tlWyAI4p5dMC+o/KNhyiUslTD61aJIy5H4mw8eiDWpkqRkruS
++Rgyl0TzDxjlV41JGH+BlDLkENi1ku/ei6dqNv9HF7Y29kLyoHuy9Ff3ERWcQ5sl
+qHZg7ylRjwpI92EyF4vKKB2RXKjz7DAMF/cVgQujzsfwYwxvVP1pELPRpfe+0G+D
+gvhGawqM2cGyF9goyDiZjIKxiPdT9uAppbJtZ4mh6yQzFMvgk2cDqC6g4HWhQwgP
+eIGAg3a2rBKmkU90+Yj7dVSQmMxPi21/XWvY
+-----END CERTIFICATE-----

EVSE/rootfs/etc/lighttpd/ssl/privkey.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyWA6XPzNbOU+xeqlUo76Kmp/CHkFiuI0dMPeSx83P7G/jJ0T
+rJgDhgSevQeyaWaXztqH7UhD8SvlN7TydgSspkmqXoPkCa4bKnAkDw/ewp2IjiPD
+moRYr3QXm76aITeHl4Vx/PYfZtkvkouKC8GRJqyc0nelehiyocTyjc8zxJPZaDbF
+jlHU3bidk6xgfRs4NyDNKe7dlAT4LrMNopSD6fAReJVOGM/eNXhU99ln82qNto5S
+8LBnwBLNvXKPDVG1VpPG9i7kU81mJvb8TYTM4om5BMkStCwSEnXrD6E6lYgD15K3
+iBOF6mbwzLMyRhMB1Z2IboAVqEmBBFcc7hePUQIDAQABAoIBAQCPShqdWgEuUD0H
+hXyXr0cQ8XBs7fhkp6rdvxWo7JBakTcUbhy2vgAb16PAK/7mgurYdKUt0TMPI8XZ
+irbQBWl4dYh18nFL9gg8fUkbMpa2cnPdeFNR2oRkbD30Q37WzfV8eqbucY9MlpQE
+OahDzztigoagOCSWKYbKFyLkhyB16d8HXdD7PQbruQaO+GK7xAyiFyebe1Sh2Yl5
+NFzBmL0W7mLlP8k4cgnpwtSznWntEbXP3hZfVV8654lF8igXFxfUqhf2XYRHZbNp
+SttnPikJtJDJNmJYiaOLSklbVoPTi6dyefmhyKTmqwM+PfN1NIPznvuPeyjF/Mi6
+jitDacRxAoGBAOqxU4tVQP03Mv5G3Kyj7J7VF0jELSoKnU7U535Ynq1GAQ4dNicV
+7gYkE+E6+edHbf26tXt2u5cKktEipQVSIPkbgg8caWFLMA6wyxSkVfgSkv5Gc6S7
+V7jkiUjLTEQGYcJ0qF3V1Mvmn2QurwtiAmOsk6wb06a/4XD75n7j23V1AoGBANuo
+j3bNGa4NFJJk0s+yWAFtkRB8KQyfR8Ut6V5uV9jqNyBdyfT4uvmjbhyD8GLJ84K3
+sXq7RLQSxVNqb73BaL8yTXhHGISG/hZVB2On1boSqPcsz/6WQGEUVRlLzdV4+r/x
+02iO4m+Zuv1JMx4jtPSy492YEIk64sOPV/9FGErtAoGAAdn2Q8Ifah/2WgUrFn2Q
+j0w1C9DoXk2JIicR0HBYiBtmRLs8QyCsKQY91egGMqngl0DSz6+HGVDvCZFRZfJY
+6j4qT3404pyaO3NvlrEZMITM/g6GOQV1UrMS1i0sY9j9CnCrJ1pZfGZMWZj4rolO
+ZYTmAVSS3dzjpWWHUvbvM0UCgYA6wTmus2ndDo6kIefpunCj4STeXfe08p4F9iPo
+KGfDE9MvCydMKYQJ5lc7tWcFZbOHEY+dnp3f9O1nRJ8jCKr2CYSDWbELMfihDJlv
+ZKNcpEUh6JCyLoqF7SReIdKq+TNJSGweGaoj4+EKgxvzQeXTVk5xJY22x1OEr8D/
+/QFkeQKBgATsb126LOPovDCeZMf8/VoIAqsQBysj2A33cDc8fM13Yf624CJ5eJAH
+HICyD5pDF0VuqwfLs0KnWbuwegwAwZFvIJift+/UgIIamCu4ig+kBbnDCZLrbkBc
+GtMcRJQXZls1Me+V0XFRxjk9/8vxV2bfqI++o5DDWIMnoCIKujuH
+-----END RSA PRIVATE KEY-----

EVSE/rootfs/var/www/index.html

@@ -1,7 +0,0 @@
-<html>
-<head>Test</head>
-<title>Test page</title>
-<body>
-	<h1>Test</h1>
-</body>
-</html>

EVSE/rootfs/var/www/index.php

@@ -1,3 +1,3 @@
-<?
-	phpinfo();
-?>
+<?php
+	header("Location: set_system.php");
+?>