From bc1a79038ccb55631278dc36d5a6e0e053a0b717 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Tue, 16 Apr 2019 17:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0ZLToolKit(=E5=AE=8C=E5=96=84s?= =?UTF-8?q?sl=E7=9B=B8=E5=85=B3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- tests/CMakeLists.txt | 2 +- tests/ssl.p12 | Bin 0 -> 2417 bytes tests/ssl.pem | 30 ------------------------------ tests/test_httpApi.cpp | 7 ++++++- tests/test_httpClient.cpp | 7 +++++++ tests/test_server.cpp | 6 +++++- 7 files changed, 20 insertions(+), 34 deletions(-) create mode 100644 tests/ssl.p12 delete mode 100644 tests/ssl.pem diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index 7bbc1e1c..cf4fec12 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit 7bbc1e1c546841c5b788ac8fc98c965986f78430 +Subproject commit cf4fec12a2ad6429f4aaf4e541a7cac99931c3a6 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9cabf288..176fa6ac 100644 --- a/tests/CMakeLists.txt +++ b/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) diff --git a/tests/ssl.p12 b/tests/ssl.p12 new file mode 100644 index 0000000000000000000000000000000000000000..d3a0516f2513899f9573347cd2e2691a2b248d42 GIT binary patch literal 2417 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 Z-1-Scgfsazgm3;(=yj9Col+1G_!qJ&am@e# literal 0 HcmV?d00001 diff --git a/tests/ssl.pem b/tests/ssl.pem deleted file mode 100644 index c6105f4e..00000000 --- a/tests/ssl.pem +++ /dev/null @@ -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----- diff --git a/tests/test_httpApi.cpp b/tests/test_httpApi.cpp index 2bbc6642..932b6434 100644 --- a/tests/test_httpApi.cpp +++ b/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()); diff --git a/tests/test_httpClient.cpp b/tests/test_httpClient.cpp index 786048d6..260a0cc0 100644 --- a/tests/test_httpClient.cpp +++ b/tests/test_httpClient.cpp @@ -48,6 +48,13 @@ int main(int argc, char *argv[]) { Logger::Instance().add(std::make_shared()); Logger::Instance().setWriter(std::make_shared()); + //加载证书，证书包含公钥和私钥 + 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 downloaderMap; diff --git a/tests/test_server.cpp b/tests/test_server.cpp index c5516409..433d46ec 100644 --- a/tests/test_server.cpp +++ b/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];