更新ZLToolKit(完善ssl相关)

3rdpart/ZLToolKit

@@ -1 +1 @@
-Subproject commit 7bbc1e1c546841c5b788ac8fc98c965986f78430
+Subproject commit cf4fec12a2ad6429f4aaf4e541a7cac99931c3a6

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-execute_process(COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/ssl.pem ${EXECUTABLE_OUTPUT_PATH}/)
+execute_process(COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/ssl.p12 ${EXECUTABLE_OUTPUT_PATH}/)
 
 #查找SDL2是否安装
 find_package(SDL2 QUIET)

tests/ssl.pem

@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDe56xOopefsL3K+kfpDohkBnjZaTCLVdS+p6BUeRbeFO9xOaGy
-5hPnVLHI1nlpRZaKfxm1MY9fDBh1kSbjhSqim9HUBoSvEE32yMM+0GIoNKKDWmhd
-ePDXuSNO6d9nabg+5gmrR2fyYtSigTH6liqGSjhblAozlaXVZVYZOs/ePwIDAQAB
-AoGAYcjkMALn3SgduoOdNEIp1yd3sHiS0S0wDQtgLG6Kd5ZbjCIqK17/cEYZT++2
-h1X9ungTgQdiy+F0gW7RzpHGp4lso2a8PgEUIt4HICLZqBOWv6kId43kysBZQS/5
-5g0ZGJGU5BFTdHzN5chaPE32MRGPpukNngRuRruRvoQaOuECQQD0EoC6EHwLehFI
-KoLnDtzXpR1f4eRRbxJ6U/05Kr4+nz+MB7A2ilGEf+E7iCvoRGYkuieEuKYS9+NQ
-Bv67i/aZAkEA6cxan6Q5BsSCoIKGbqATxW40j7m0Ii3VFb4w9vgaI0mHdRl9x59x
-LKsIamcJZI7szmJdOi3tBKB9Xc3PxfD6lwJBAIYOU53eyAMVvMBCeTunsizPh97O
-F7WSqDeAQilQDMYgearT3jlWp4d7JZ6pIFSmnOO3S1VehfkNJlEiRm+EZKECQCEb
-+IV9GzpTH/CdK26FKueduMHV2aWxeeivW33OGt1+bzltF7vqX3uk6Pcwikr8VprP
-oUY49MTf+YEMQW1VuBcCQA3UvxGx7YbD3RihysBmTLHyF2DOR3pBQdL1jH5fFI9k
-mMo0M2cvHytsIYZ69oULJkQ0TyNBslm/TLaHAK6fHbo=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICWDCCAcGgAwIBAgIJANTNO5CfgnKmMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTYwMTExMDgyNTIxWhcNMTkwMTEwMDgyNTIxWjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDe56xOopefsL3K+kfpDohkBnjZaTCLVdS+p6BUeRbeFO9xOaGy5hPnVLHI1nlp
-RZaKfxm1MY9fDBh1kSbjhSqim9HUBoSvEE32yMM+0GIoNKKDWmhdePDXuSNO6d9n
-abg+5gmrR2fyYtSigTH6liqGSjhblAozlaXVZVYZOs/ePwIDAQABo1AwTjAdBgNV
-HQ4EFgQUKOfhSgRHIkKMX7cwlVIBR493EXQwHwYDVR0jBBgwFoAUKOfhSgRHIkKM
-X7cwlVIBR493EXQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQCxs7Ge
-0mjdtHhFd7qerYVYS0uvVzRdYsYnK+rY6Y5wtXEWDNG2EOLA5/puaj93mvesKXTl
-plTjFUnhmyXwwvXuKx+PdK87FXl4sTIyvf4/1eN2QIpy6WU4lAE11ONNF8djNc4W
-FCu9etyoYfy6NE4C/ntJpB0xCNrX1cvrmukb6g==
------END CERTIFICATE-----

tests/test_httpApi.cpp

@@ -113,7 +113,12 @@ int main(int argc,char *argv[]){
 	loadIniConfig();
 
 	//加载证书，证书包含公钥和私钥
-	SSL_Initor::Instance().loadServerPem((exeDir() + "ssl.pem").data());
+	SSL_Initor::Instance().loadCertificate((exeDir() + "ssl.p12").data());
+	//信任某个自签名证书
+	SSL_Initor::Instance().trustCertificate((exeDir() + "ssl.p12").data());
+	//不忽略无效证书证书(例如自签名或过期证书)
+	SSL_Initor::Instance().ignoreInvalidCertificate(false);
+
 
 	//开启http服务器
 	TcpServer::Ptr httpSrv(new TcpServer());

tests/test_httpClient.cpp

@@ -48,6 +48,13 @@ int main(int argc, char *argv[]) {
     Logger::Instance().add(std::make_shared<ConsoleChannel>());
     Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>());
 
+    //加载证书，证书包含公钥和私钥
+    SSL_Initor::Instance().loadCertificate((exeDir() + "ssl.p12").data());
+    //信任某个自签名证书
+    SSL_Initor::Instance().trustCertificate((exeDir() + "ssl.p12").data());
+    //不忽略无效证书证书(例如自签名或过期证书)
+    SSL_Initor::Instance().ignoreInvalidCertificate(false);
+
     ///////////////////////////////http downloader///////////////////////
     //下载器map
     map<string, HttpDownloader::Ptr> downloaderMap;

tests/test_server.cpp

@@ -262,7 +262,11 @@ int main(int argc,char *argv[]) {
               " rtmp地址 : rtmp://127.0.0.1/live/0";
 
     //加载证书，证书包含公钥和私钥
-    SSL_Initor::Instance().loadServerPem((exeDir() + "ssl.pem").data());
+    SSL_Initor::Instance().loadCertificate((exeDir() + "ssl.p12").data());
+    //信任某个自签名证书
+    SSL_Initor::Instance().trustCertificate((exeDir() + "ssl.p12").data());
+    //不忽略无效证书证书(例如自签名或过期证书)
+    SSL_Initor::Instance().ignoreInvalidCertificate(false);
 
     uint16_t shellPort = mINI::Instance()[Shell::kPort];
     uint16_t rtspPort = mINI::Instance()[Rtsp::kPort];