Skip to content

Commit

Permalink
20190923
Browse files Browse the repository at this point in the history
  • Loading branch information
ldcsaa committed Sep 22, 2019
1 parent aea45e0 commit 890407c
Show file tree
Hide file tree
Showing 754 changed files with 56,499 additions and 28,262 deletions.
1,408 changes: 1,036 additions & 372 deletions Doc/HP-Socket Class Diagram.uml

Large diffs are not rendered by default.

Binary file modified Doc/HP-Socket Development Guide.pdf
Binary file not shown.
Binary file modified Doc/HP-Socket HTTP Class Diagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/HP-Socket SSL Class Diagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions Linux/Change-APIs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
# ======================================== #
HP-Socket v5.6.1 API Update List:
# ======================================== #
--------------------
1、HTTP:
--------------------
HP_HttpServer_SendWSMessage (UPDATE: delete 'lpszMask' parameter, 'pData' parameter change type to 'const BYTE*')
HP_HttpAgent_SendWSMessage (UPDATE: 'pData' parameter change type to 'const BYTE*')
HP_HttpClient_SendWSMessage (UPDATE: 'pData' parameter change type to 'onst BYTE*')

HP_HttpServer_SendChunkData (ADD)
HP_HttpAgent_SendChunkData (ADD)
HP_HttpClient_SendChunkData (ADD)

--------------------
2、SSL:
--------------------
enum En_HP_SSLSessionInfo (ADD)
typedef HP_Fn_SNI_ServerNameCallback (UPDATE: add parameter 'PVOID pContext')

HP_SSLServer_BindSSLServerName (ADD)
HP_SSL_DefaultServerNameCallback (ADD)

HP_SSLServer_AddSSLContextByMemory (ADD)
HP_SSLServer_SetupSSLContextByMemory (ADD)
HP_SSLAgent_SetupSSLContextByMemory (ADD)
HP_SSLClient_SetupSSLContextByMemory (ADD)
HP_SSLServer_GetSSLSessionInfo (ADD)
HP_SSLAgent_GetSSLSessionInfo (ADD)
HP_SSLClient_GetSSLSessionInfo (ADD)

# ======================================== #
HP-Socket v5.5.1 API Update List:
# ======================================== #
--------------------
Expand Down
40 changes: 37 additions & 3 deletions Linux/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,38 @@
==========================================================================================
v5.6.1 Update:
==========================================================================================

> SSL Update
-----------------
1. All SSL components add the following interface methods to support loading memory certificates:
1) Server: SetupSSLContextByMemory(), AddSSLContextByMemory()
2) Agent : SetupSSLContextByMemory()
3) Client: SetupSSLContextByMemory()
2. All SSL components add GetSSLSessionInfo() method to obtain information about SSL session.
3. SSL Server component provides a default SNI server domain name binding mechanism. In most cases, the application does not need to customize SNI callback function.
1) The default server domain name binding mechanism is enabled when the 'fnServerNameCallback' parameter value of SetupSSLContext() is nullptr.
2) BindSSLServerName() : Bind the server domain name to a specified certificate.
3) HP_SSL_DefaultServerNameCallback() : Default SNI callback function.

> HTTP Update
-----------------
1. The SendWSMessage() method of HTTP Server component delete 'lpszMask' parameter.
2. The 'pData' parameter type of the SendWSMessage() method for all HTTP components is changed to 'const BYTE*', so constants can be passed in.
3. All HTTP components add SendChunkData() method to send chunked data conveniently.

> UDP Update
-----------------
1. Optimize the UDP Cast component of Linux platform so that it behaves in accordance with the UDP Cast component of Windows platform.
2. Enhance IPv6 compatibility of all UDP components.
3. Automatically send a "close notification" datagram to the peer when the UDP Client/Server component is closing.

> Other Update
-----------------
1. jemalloc upgrade to version 5.2.1
2. openssl upgrade to version 1.1.1d.
3. Code optimization to improve stability

==========================================================================================
v5.5.3 Update:
==========================================================================================

Expand Down Expand Up @@ -163,7 +197,7 @@ v5.2.1 Update:
2. Agent: HTTP Agent, HTTPS Agent
3. Client: HTTP Client, HTTPS Client, HTTP Sync Client, HTTPS Sync Client

> Create Demos
> Create Demos:
-----------------
1. testecho-ssl: (SRC) SSL simple test echo server/agent/client
2. testecho-ssl-pfm: (SO) SSL performance test echo server/agent/client
Expand All @@ -172,7 +206,7 @@ v5.2.1 Update:
5. testecho-http: (SRC) HTTP simple test echo server/agent/client/sync-client
6. testecho-http-4c: (4C SO) HTTP simple test echo server/agent/client/sync-client

> Other Updates
> Other Updates:
-----------------
1. Version number revision: Use a unified version number for Windows & Linux distribution
2. Code optimization and knowing bug fixed
Expand All @@ -187,7 +221,7 @@ v1.0.0 Update:
2. Agent: TCP Agent, TCP Pull Agent, TCP Pack Agent
3. Client: TCP Client, TCP Pull Client, TCP Pack Client, UDP Client, UDP Cast

> Create Demos
> Create Demos:
-----------------
1. testecho: tcp simple test echo server/agent/client
2. testecho-pfm: tcp performance test echo server/agent/client
Expand Down
22 changes: 21 additions & 1 deletion Linux/build-android-ndk.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
@echo off

set CURPATH=%cd%
set PROJECT_PATH=.\project\android-ndk
set LIBS_OUT=.\lib\android-ndk
set OBJ_OUT=.\lib\android-ndk\obj


cd %~dp0

call ndk-build NDK_PROJECT_PATH=./project/android-ndk NDK_LIBS_OUT=./lib/android-ndk NDK_OUT=./lib/android-ndk/obj %*
rd /s /q %LIBS_OUT%

call ndk-build NDK_PROJECT_PATH=%PROJECT_PATH% NDK_LIBS_OUT=%LIBS_OUT% NDK_OUT=%OBJ_OUT% %*

call :cp_static_lib arm64-v8a
call :cp_static_lib armeabi-v7a
call :cp_static_lib x86_64
call :cp_static_lib x86

rd /s /q %OBJ_OUT%

cd %CURPATH%

exit /b 0

:cp_static_lib
xcopy /y /s /f %OBJ_OUT%\local\%1\*.a %LIBS_OUT%\%1
goto:eof
22 changes: 21 additions & 1 deletion Linux/build-android-ndk.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
#!/bin/bash

set -e

cd $(cd "$(dirname "$0")"; pwd)

ndk-build NDK_PROJECT_PATH=./project/android-ndk NDK_LIBS_OUT=./lib/android-ndk NDK_OUT=./lib/android-ndk/obj $@
PROJECT_PATH=./project/android-ndk
LIBS_OUT=./lib/android-ndk
OBJ_OUT=./lib/android-ndk/obj

function cp_static_lib
{
cp -f $OBJ_OUT/local/$1/*.a $LIBS_OUT/$1
}

rm -rf $LIBS_OUT

ndk-build NDK_PROJECT_PATH=$PROJECT_PATH NDK_LIBS_OUT=$LIBS_OUT NDK_OUT=$OBJ_OUT $@

cp_static_lib arm64-v8a
cp_static_lib armeabi-v7a
cp_static_lib x86_64
cp_static_lib x86

rm -rf $OBJ_OUT
2 changes: 1 addition & 1 deletion Linux/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ parse_args()
do_build()
{
C_LAN_OPTS="-c -x c -I $DEPT_INC_DIR -Wall -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-pointer-sign -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fpic -fvisibility=hidden -fexceptions -std=c11"
CPP_LAN_OPTS="-c -x c++ -I $DEPT_INC_DIR -Wall -Wno-reorder -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fpic -fthreadsafe-statics -fvisibility=hidden -fexceptions -frtti -std=c++14"
CPP_LAN_OPTS="-c -x c++ -I $DEPT_INC_DIR -Wall -Wno-class-memaccess -Wno-reorder -Wswitch -Wno-deprecated-declarations -Wempty-body -Wconversion -Wreturn-type -Wparentheses -Wno-format -Wuninitialized -Wunreachable-code -Wunused-function -Wunused-value -Wunused-variable -fno-strict-aliasing -fpic -fthreadsafe-statics -fvisibility=hidden -fexceptions -frtti -std=c++14"
LINK_OPTS="-Wl,--no-undefined -Wl,-L$DEPT_LIB_DIR -L$DEPT_LIB_DIR -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -shared -Wl,-Bsymbolic"
RELEASE_CFG_OPTS="-g0 -O3 -fomit-frame-pointer -DNDEBUG"
DEBUG_CFG_OPTS="-g2 -gdwarf-2 -O0 -fno-omit-frame-pointer -DDEBUG -D_DEBUG"
Expand Down
164 changes: 164 additions & 0 deletions Linux/demo/global/helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2032,6 +2032,170 @@ LPCTSTR GetDefaultCookieFile()
#define SSL_CERT_RELATIVE_PATH_1 _T("/hp-ssl-cert/")
#define SSL_CERT_RELATIVE_PATH_2 _T("/../../ssl-cert/")

LPCSTR g_c_lpszPemCert =
"-----BEGIN CERTIFICATE-----\n"
"MIID6TCCAtGgAwIBAgIDAIFpMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkNO\n"
"MQswCQYDVQQIDAJHRDELMAkGA1UEBwwCR1oxDDAKBgNVBAoMA1NTVDEPMA0GA1UE\n"
"CwwGSmVzc01BMRcwFQYDVQQDDA53d3cuamVzc21hLm9yZzEeMBwGCSqGSIb3DQEJ\n"
"ARYPbGRjc2FhQDIxY24uY29tMB4XDTE2MDEwMTAwMDAwMFoXDTI2MDEwMTAwMDAw\n"
"MFowcjELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQwwCgYDVQQKDANTU1QxDzAN\n"
"BgNVBAsMBkplc3NNQTEXMBUGA1UEAwwOd3d3Lmplc3NtYS5vcmcxHjAcBgkqhkiG\n"
"9w0BCQEWD2xkY3NhYUAyMWNuLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\n"
"AQoCggEBAOFlDuWj95Nov+48W0ZaUp69GVB+U3orPuVm+fU5gXgl0tJbNbXS0GOM\n"
"MspmMB0WxciTfj+t/WufpcHKzryHwrbqmMgrZiSyrp4ulA2mQuTPR32vgQ3/2eBs\n"
"O884GmKOUbiaORgHGBoRAdOnoWarM7B/igS6WGqPetaUz12QAv2vzw9Qn0xxIBpr\n"
"SVJumTo9HtOvuRj0BNXMRRYp+lfX2+96cftidyU1q+2Y2v3Fedzlo8Lr7m1ZkPcp\n"
"ugQDz3R0kXvigDPAKhbTj6eAXJ/hcPOCGQ5RTIZJH4JnJ2jKw5lTjJ6y0rbt9Jq9\n"
"NuIqz3GORHYWY4xBmbdTZy0BrbQOePECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg\n"
"hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O\n"
"BBYEFHYUdE6SbzXIWA8m3TwdgUJfAT6+MB8GA1UdIwQYMBaAFPx+7pAUh/GVC8xa\n"
"OXmmZ8GMvpyIMA0GCSqGSIb3DQEBCwUAA4IBAQCZWaDrHbRHNNEaCVVFl5WCNqyd\n"
"y1MpI2iErmfiCTNiG4v9wImTGWIWRHc3dZowniwSb43OuuhlpdWCxeal9nTL6iCP\n"
"B486EMOsVWcfUZkPeK4cBgRXbHTmjxfmQEHHA6NTQdRc7LGq4tjhYs8zmxBVI2HO\n"
"uIp0Qbj/Mb2j8r13IC91Z5Ontq0mQTIg0vvffZsqvcjs3Mmrxr2iX/EYpKNR2DP+\n"
"9msWTZH734tZ2I7vORZOprpdAwELOyVLXkKIcP9qkRPAcFNk0Fl5peBQtBuP1ky5\n"
"kUzWMQq2eoy73miPRnQ8ZjZ/3xTXhMKJ6bCn3tbWrjvc1TwpobfwyfsFH9sq\n"
"-----END CERTIFICATE-----\n";

LPCSTR g_c_lpszPemKey =
"-----BEGIN RSA PRIVATE KEY-----\n"
"Proc-Type: 4,ENCRYPTED\n"
"DEK-Info: AES-256-CBC,5F6ACADA6B6B1238FD34A0EC0C5EC2ED\n"
"\n"
"F0JylDtptlBaFpbCP9Qa2pRf5z8sBbUta6G+rBwuWn7GxU//Nub49/Mf0uRm3YTN\n"
"PmCbIQKRyn/u92Yk6cJ9vLCiWe89pa+qlv+kF9PWmYo8Lt6dvtSr1TNAjelGvQjC\n"
"HAi58BHoXXIRrZJQKjzFKGcwhWExCAOct5UDuHu64IvWg+LDccd+tTU/kdKEI9QY\n"
"3POohP6etBBsFIoJFd23yxxNrvxK/v0as7EI/SeFzv7Mfn7haL4LxEsN+9XPN/Ap\n"
"U0IxOT84dMgtIsvW2gvit+qNuaSvrocyEOr5uEfpoS58/yyb0VyNg94itkc6IK3X\n"
"Yeokm2YOJk/4yMoZAeNMMDdR82csCzpTTHurMIZLgtr+SO1ChtreKm0XQB8QNyJ+\n"
"CouAAHOBsxTPgVY/QS1TDrmEZv7cHOAvJp7BYvKroD/pi5Wu2IHAlIEXhdW3Evwn\n"
"jyzUgMUHdXJIcngkkopYEoTPVEXsYX6aHvPJI+jDDKIfDM75SOOw1z7Divsb77I8\n"
"n1jMYDUH4i2g2BixfwFRPxZ6NnRLtqM+TD4yecu3zsqvs0UIlrZFuVIl98Guqa1H\n"
"tJKCxWEaJNb5YZg8GgdZFXYWXUN/HtFqWJelhGcjy48RjOy7LHJ30fkXV07b2s6M\n"
"XcXj9g4jRRyAiZ/kmTqs+Oj6hn+iI4vdGumc2sG0+ZkUwDkj3zfn1N1+J/htVM1z\n"
"Y2kHpKGZzQZ4eriy6CM++FrZ9CSNIPqh5AzayPuMxvEtd27vBnO8nKMwThbhGPtj\n"
"fd7uPPzfG/W7Zo55lYL5opEzvOdULWm8+31ojitN7GSjsFW46HWoyYfTOlTAzP5+\n"
"yPlUGxUyBhlqeXnQNTiLtRb22I2FF41HYH7GsYcxonHw3rKCcJedzL5BMg6Ic2xN\n"
"ZxwXdj20rkugtcSAPxp3OGrmBiCX0wYiZaSgNg5zqI1SIhiWzkq64xoiIFlmxGEo\n"
"Q/Vv7mpRmf1X0eTjiTYz4tYU6TPgtAqLLpmVNbozPnb5eGaMDbRlJnGJjqlXzPAw\n"
"7qUhsb/KZ/k7yZLE+rseicwtAYA0th9A2tpc0CY3/EiL0w5E3zR0SPMinCJeO0rJ\n"
"91njgDPxJ5lPXC04Dlgt/a1WK6D/yQ2kpIiNBUIlGZtr+nD9GqPYiGTqND53TL5f\n"
"PJrr1PibL2l3fyhNDgNhgmY1CGpB6hNkqPOpit+XhGq6X0PlELcj7zYN3acW47jp\n"
"KVm2lT1AXhzqemTWqPQL1+3s8ix0nGVNlmzsOFHqCkmr7FZb76hD5YTtGkOU/Kn3\n"
"I5GqS5GHSCAVJnJWuFk2Y8qqg69mJREcoKThoYsuo8hw9JqZM34JIqqT029Nj35B\n"
"xau4hSXkmHuUCGpwbr0yvsz3ikRfM6y0cT3T6oBiWgfYktpX//89YbyYGcQX7tK0\n"
"aaHW2zvAfMyCWT0CxRen5GAyVeb+WFBdo+xD0HpQcRFtByiNNXmm4kJAoZujeHpe\n"
"ZWcu3xkVcTqWMixAYHcDv3L0EXUnVeWplovRh1+OSm7YvdaLL3cctHoW3a8Kzdc1\n"
"rtoGVI+f4xSEDheB5P4NX6UYbDLIGMPPuR0F5EliL+vmyJcEMuLY8KTPJ0uwf7Ns\n"
"-----END RSA PRIVATE KEY-----\n";

LPCSTR g_c_lpszCAPemCert =
"-----BEGIN CERTIFICATE-----\n"
"MIID0TCCArmgAwIBAgIJALFGobpzN5MdMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNV\n"
"BAYTAkNOMQswCQYDVQQIDAJHRDELMAkGA1UEBwwCR1oxDDAKBgNVBAoMA1NTVDEP\n"
"MA0GA1UECwwGSmVzc01BMRcwFQYDVQQDDA53d3cuamVzc21hLm9yZzEeMBwGCSqG\n"
"SIb3DQEJARYPbGRjc2FhQDIxY24uY29tMB4XDTE2MDQwMTE1MDIwMFoXDTI0MDYx\n"
"ODE1MDIwMFowfzELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQswCQYDVQQHDAJH\n"
"WjEMMAoGA1UECgwDU1NUMQ8wDQYDVQQLDAZKZXNzTUExFzAVBgNVBAMMDnd3dy5q\n"
"ZXNzbWEub3JnMR4wHAYJKoZIhvcNAQkBFg9sZGNzYWFAMjFjbi5jb20wggEiMA0G\n"
"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDht6llexLtFkV8ijjdJGaHXXQysWOJ\n"
"UM/YQFYP52nviurJSpMbWSXnuaDlfidk76B66Np5mlnN5BiHqbBj34GCVKz5VQtx\n"
"3kMY1y30YWyiHAEZiV3PLQc8/A9MnJM/q/mHaulmTuJi8A85TWadqUNXgiaIMkqz\n"
"bKaauR1/GCxXuEVroqtyR99RCWhfakTz04KfIbt83QR0imWC6uhmvD/DXJ03XFzd\n"
"XkK5aNp+ef1sBQgFKjeXV6EMuq+UgEDPXlCDUJAqsZt6W/ohrCAHWQYZ/RSvvaMJ\n"
"O7aWROGAC/lh6ATOIbFlGVppw6zUGdIDkB5FVF1MC7CyDndncFrY+OJzAgMBAAGj\n"
"UDBOMB0GA1UdDgQWBBT8fu6QFIfxlQvMWjl5pmfBjL6ciDAfBgNVHSMEGDAWgBT8\n"
"fu6QFIfxlQvMWjl5pmfBjL6ciDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA\n"
"A4IBAQDI+f6GMBJxRJNKrgbUYLD1U6LWEQJQ50g2NxGy0j+TL6oypoo/kyME3tOR\n"
"EmXEDzytGcSaQ78xYcg97UQd8OhXYQr0qwZ/JLarmhCVK/bfbGTIn4Mk4ZgDqcOU\n"
"46jsJeEZwUSrrq7svKO5d7+wV0VGPO+Ww4yzRCPwm2puXFY1+KpTxYX31+wwMB8p\n"
"7GuJEDgV08qzLfcBAfSFFYiOHL3tJ+XNKFNRqigjeYrWuAMphOhpYfYnU0d0upe8\n"
"wWx9Unm8qSkc7hiS/vvs1v7Pv1sqMFRBoaKOTqZ7Wz/5AySGPQjeMV/atmArDEkx\n"
"z58OEgTzg1J/Keztxwj7I2KnYHyH\n"
"-----END CERTIFICATE-----\n";

LPCSTR g_s_lpszPemCert =
"-----BEGIN CERTIFICATE-----\n"
"MIID6TCCAtGgAwIBAgIDAIFoMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkNO\n"
"MQswCQYDVQQIDAJHRDELMAkGA1UEBwwCR1oxDDAKBgNVBAoMA1NTVDEPMA0GA1UE\n"
"CwwGSmVzc01BMRcwFQYDVQQDDA53d3cuamVzc21hLm9yZzEeMBwGCSqGSIb3DQEJ\n"
"ARYPbGRjc2FhQDIxY24uY29tMB4XDTE2MDEwMTAwMDAwMFoXDTI2MDEwMTAwMDAw\n"
"MFowcjELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQwwCgYDVQQKDANTU1QxDzAN\n"
"BgNVBAsMBkplc3NNQTEXMBUGA1UEAwwOd3d3Lmplc3NtYS5vcmcxHjAcBgkqhkiG\n"
"9w0BCQEWD2xkY3NhYUAyMWNuLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\n"
"AQoCggEBALEOPuYKEl/iN3ub/QNaaqo0Hynk62znTp5kXj0zQAqxLxwHU117xHBk\n"
"0LCZux0LnDFl9JAlilvqfeaXRWmQd6hrvV+1mNpnIe2xfyNWwa37QDNjXB7mEg3V\n"
"O/dN9KeVxq9RlH/dQJ7qZlYy4i7wznYMUlz38378wYoOvdAQBX1UrdjWA5T4q0Da\n"
"cRRAV0fIp45hBarp6T1nhDEvttU8yud2lIEV9jWblkyGIhU4FisGOIRRGhnKzCAh\n"
"CYSZ59mq8Wf4FawMyz/H4noHcWWJu4ID1oAE+VFGXKm78qjp/T71/myn5lcGquTx\n"
"oSoJrx7og+529eaJwgeJd2JF7OQ5NysCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg\n"
"hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O\n"
"BBYEFO0CmyFtrGLrkNkkA62QPzSp8vgJMB8GA1UdIwQYMBaAFPx+7pAUh/GVC8xa\n"
"OXmmZ8GMvpyIMA0GCSqGSIb3DQEBCwUAA4IBAQBT1JGXn7HMyNHZntM4kCp7kwN9\n"
"HSpcbQxbWFtk+l8ANP9SqCIEd4xc4rAaUDDDMdD2S0wF9iio1MA1KC5OoJ5Dqw6C\n"
"yTa08LRowlmnw+NNZC2xzaSRmzLGlPDHNauZ/G2ScdWsqR5v2+pKF7bYxAajRkk5\n"
"oqRRDI6X7vHsvX/kqTn9Prk0sFmU0EU64az2iUe/MG9v1WY8eOV+tTEq29GuYYjJ\n"
"E3H8vaeq1fTB0vYgT5xoCc36xVXju/3l17CE12n5of004u4eRi3/T0wbp9WgG2ns\n"
"wjetaYeIAWS/AJQzIK22tztGAbAk6kTgsO5YLx2h6GLGpytDXWvgzr2PdEu1\n"
"-----END CERTIFICATE-----\n";

LPCSTR g_s_lpszPemKey =
"-----BEGIN RSA PRIVATE KEY-----\n"
"Proc-Type: 4,ENCRYPTED\n"
"DEK-Info: AES-256-CBC,107800C9B21513D8F642A394FAD9047E\n"
"\n"
"bmaTCBYAzKzpUrdaT6sb/dbH5o3JbFu2d8s1NfKhghYUG/RWgzx5H8QWSsh1Ll+8\n"
"701HwSwauwbKaBWzWP5bj4mjw9hXcva8l1QWeuW+Q0GsE7uWNZGFQZbCxER/9jOu\n"
"36KMlx0twcIEGs9PNwnY7d9oS/BMVpiUqhL8sPihMLCFK0fm6VGjMrfdIZJuZXEv\n"
"BKt+c0UPkkPmivZjSm6iTPKI6VpGeyg0sM/uZr+mRj7IOAD6vsSQnCfUOq00Rm14\n"
"ABrer8dCWJDKrx1iLq7tFojII+JcB7oBy+8KC/t0MlqmIP2jx93/MVW5lbZ3mj2v\n"
"BanVQvklHTLe/WHjoaltqBEKN0sIzfyed6qWudKHUa8yjAr0PS4rsTbO0S4fFz+A\n"
"KFWEs8fuXsanFHt5akWDTMiw1n4HaiioT4jjhWRRIKGEndztyGMklShYAdSTqsZO\n"
"vzPO+xqLlg6wOgCGZ3Kl/c243XyLMCI+lJlzu3ccqzQJbNfPADXUcxSTqaEByWG3\n"
"YIXttKY5WFBcNjf9B3c1qfJMt3nGY2QewnL+rNm/qpose/AsFS+2aqMeRw7fYh3R\n"
"O+H+G+0gxrSK0E3WiewMIvUqFI6W300MWx6O7d87OkbfwMLpLPumsfLKswOKaAIF\n"
"p0RxSABSe5ixqnErsoiYGNf3bln4tsQ+v5jYUY+Gn/9mVTPEYs6uwC78UW5Gj+Za\n"
"lB3V8aRxQjWBerhLhf3iCmkkOVaG5JvVJDmvwo6iBRZ4NNzkAqOJm/UvfWoKN91b\n"
"riHAWNayqvOfzaK6KYiJlOR9D779pK6xL+gZ0zo3rIA2yzs5MJAvJmaq6SQmQFl1\n"
"Vzhnf3hIGJFtJYQJhlr36pkPgG9jVdJPhZisY9EsIAHvDbbLlBNexSmZc2RZmsVL\n"
"VG6WqOm85DzuZxGULK/CnXCLpBMKWf9y5YPJrLkuwQILrr2btnAivPfUU80S3E0c\n"
"VslBodCkSGVx3iQoAVJv2+6ZNMRNLVzpLnlaVtHl/gvw+InJlXmzBlZQFKOCaOny\n"
"sz67qKmK1KWui2G3AzuvTEL9O++FVO+irpSNSLozxif/erLJl7R60pBkrWwd6jGB\n"
"8qQv7ni+xIeXDBLSu26zPunLR/2PhrrCv49KmqNmF7sSNx6xmcc3CfgEy+5+Tm97\n"
"KPE4JlaH/ZW61TlzXojbZMaiJltkFkpagFgm2bXrN1nMk2d6R+Yfe78lSvPKoB8k\n"
"1m7LY1lNXFZJh2hxQRhdV9oTokFahUSitQCg1S3eASuE2jFRRL4jrh4LcBWUHZnJ\n"
"OOAwBDOF4RfGyfiDs0IlrnLvK3a2KorlHfvUyj+cwkRmgI8sWgkJuNpz1mKDn5UZ\n"
"yGn2JczHY0CiInRGgwMnS1Z/WpJZYGNh7pP7Hm1RnzVslkWSJGaKJv9jDNUCyy8R\n"
"L+nwUSd6m6r8YWcs3zdBYsDHGOO5MgAU5Q8yuLbEgaK5NJSJgGkm+ya5oB88Y6T0\n"
"JcL/u5xKw4kJiKgiLr3zrWe5qV6+lpH7fGKy7fucJWltDkfQSD3Dp0b64TW4FuQq\n"
"VQhDR+KykLK6QxM2x3/maMfG578Ku1F6g4RboDR/6uCFu6hQuCoNYBk/QB0XpY13\n"
"-----END RSA PRIVATE KEY-----\n";

LPCSTR g_s_lpszCAPemCert =
"-----BEGIN CERTIFICATE-----\n"
"MIID0TCCArmgAwIBAgIJALFGobpzN5MdMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNV\n"
"BAYTAkNOMQswCQYDVQQIDAJHRDELMAkGA1UEBwwCR1oxDDAKBgNVBAoMA1NTVDEP\n"
"MA0GA1UECwwGSmVzc01BMRcwFQYDVQQDDA53d3cuamVzc21hLm9yZzEeMBwGCSqG\n"
"SIb3DQEJARYPbGRjc2FhQDIxY24uY29tMB4XDTE2MDQwMTE1MDIwMFoXDTI0MDYx\n"
"ODE1MDIwMFowfzELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQswCQYDVQQHDAJH\n"
"WjEMMAoGA1UECgwDU1NUMQ8wDQYDVQQLDAZKZXNzTUExFzAVBgNVBAMMDnd3dy5q\n"
"ZXNzbWEub3JnMR4wHAYJKoZIhvcNAQkBFg9sZGNzYWFAMjFjbi5jb20wggEiMA0G\n"
"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDht6llexLtFkV8ijjdJGaHXXQysWOJ\n"
"UM/YQFYP52nviurJSpMbWSXnuaDlfidk76B66Np5mlnN5BiHqbBj34GCVKz5VQtx\n"
"3kMY1y30YWyiHAEZiV3PLQc8/A9MnJM/q/mHaulmTuJi8A85TWadqUNXgiaIMkqz\n"
"bKaauR1/GCxXuEVroqtyR99RCWhfakTz04KfIbt83QR0imWC6uhmvD/DXJ03XFzd\n"
"XkK5aNp+ef1sBQgFKjeXV6EMuq+UgEDPXlCDUJAqsZt6W/ohrCAHWQYZ/RSvvaMJ\n"
"O7aWROGAC/lh6ATOIbFlGVppw6zUGdIDkB5FVF1MC7CyDndncFrY+OJzAgMBAAGj\n"
"UDBOMB0GA1UdDgQWBBT8fu6QFIfxlQvMWjl5pmfBjL6ciDAfBgNVHSMEGDAWgBT8\n"
"fu6QFIfxlQvMWjl5pmfBjL6ciDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA\n"
"A4IBAQDI+f6GMBJxRJNKrgbUYLD1U6LWEQJQ50g2NxGy0j+TL6oypoo/kyME3tOR\n"
"EmXEDzytGcSaQ78xYcg97UQd8OhXYQr0qwZ/JLarmhCVK/bfbGTIn4Mk4ZgDqcOU\n"
"46jsJeEZwUSrrq7svKO5d7+wV0VGPO+Ww4yzRCPwm2puXFY1+KpTxYX31+wwMB8p\n"
"7GuJEDgV08qzLfcBAfSFFYiOHL3tJ+XNKFNRqigjeYrWuAMphOhpYfYnU0d0upe8\n"
"wWx9Unm8qSkc7hiS/vvs1v7Pv1sqMFRBoaKOTqZ7Wz/5AySGPQjeMV/atmArDEkx\n"
"z58OEgTzg1J/Keztxwj7I2KnYHyH\n"
"-----END CERTIFICATE-----\n";

CString g_c_strCAPemCertFileOrPath;
CString g_c_strPemCertFile;
CString g_c_strPemKeyFile;
Expand Down
9 changes: 8 additions & 1 deletion Linux/demo/global/helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
#define IPV6_LOOPBACK_ADDRESS _T("::1")
#define IPV4_ANY_ADDRESS _T("0.0.0.0")
#define IPV6_ANY_ADDRESS _T("::")
#define DEF_BROAD_CAST_ADDRESS _T("233.0.0.1")
#define DEF_MULTI_CAST_ADDRESS _T("233.0.0.1")
#define BROAD_CAST_ADDRESS _T("255.255.255.255")
#define DEF_TCP_UDP_PORT 5555
#define DEF_HTTP_PORT 8080
#define DEF_HTTPS_PORT 8443
Expand Down Expand Up @@ -489,6 +490,12 @@ LPCTSTR GetDefaultCookieFile();

extern int g_c_iVerifyMode;
extern BOOL g_c_bNeedClientVerification;
extern LPCSTR g_c_lpszPemCert;
extern LPCSTR g_c_lpszPemKey;
extern LPCSTR g_c_lpszCAPemCert;
extern LPCSTR g_s_lpszPemCert;
extern LPCSTR g_s_lpszPemKey;
extern LPCSTR g_s_lpszCAPemCert;
extern LPCTSTR g_c_lpszCAPemCertFileOrPath;
extern LPCTSTR g_c_lpszPemCertFile;
extern LPCTSTR g_c_lpszPemKeyFile;
Expand Down
Loading

0 comments on commit 890407c

Please sign in to comment.