Skip to content

Commit 08c0e1b

Browse files
weijunyiweijunyi
committed
Merge branch 'master' of github.com:tencentyun/tls-sig-api-v2-cpp
2 parents f229a07 + ef1bc7c commit 08c0e1b

File tree

13 files changed

+110
-431
lines changed

13 files changed

+110
-431
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ add_definitions(-DFMT_HEADER_ONLY -DRAPIDJSON_HAS_STDSTRING=1)
3939
if(UNIX)
4040
include_directories(
4141
third/rapidjson/include
42-
third/fmt
42+
third/fmt/include
4343
${ZLIB_INCLUDE_DIRS}
4444
${OPENSSL_INCLUDE_DIR}
4545
src
@@ -68,7 +68,7 @@ endif()
6868
if(MSVC)
6969
include_directories(
7070
third/rapidjson/include
71-
third/fmt
71+
third/fmt/include
7272
third/mbedtls/include
7373
# Windows 上 zlib include 路径需要手动指定
7474
third/zlib-1.2.11
@@ -84,11 +84,11 @@ if(MSVC)
8484

8585
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
8686
set(ZLIB_NAME "third/zlib-1.2.11/Debug/zlibstaticd")
87-
set(MBEDTLS_NAME "third/mbedtls/library/Debug/mbedcrypto")
87+
set(MBEDTLS_NAME "third/mbedtls/crypto/library/Debug/mbedcrypto")
8888
endif()
8989
if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
9090
set(ZLIB_NAME "third/zlib-1.2.11/Release/zlibstatic")
91-
set(MBEDTLS_NAME "third/mbedtls/library/Release/mbedcrypto")
91+
set(MBEDTLS_NAME "third/mbedtls/crypto/library/Release/mbedcrypto")
9292
endif()
9393

9494
target_link_libraries(tlssigapi_v2

‎Makefile‎

Lines changed: 0 additions & 300 deletions
This file was deleted.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ src/tls_sig_api_v2.h
5757

5858
库文件路径，分 Win32 和 x64，而且 Debug 和 Release 也通过目录予以区分
5959
```
60-
tls-sig-api_xx/xxxx/tlsignature.lib
60+
tls-sig-api_xx/xxxx/tlssigapi_v2.lib
6161
tls-sig-api_xx/xxxx/zlibstatic.lib
6262
tls-sig-api_xx/xxxx/mbedcrypto.lib
6363
```
@@ -77,12 +77,12 @@ tls-sig-api_xx/xxxx/mbedcrypto.lib
7777
std::string key = "5bd2850fff3ecb11d7c805251c51ee463a25727bddc2385f3fa8bfee1bb93b5e";
7878

7979
std::string sig;
80-
std::sgring errMsg;
81-
int ret = gen_sig(140000000, "xiaojun", key, 180*86400, sig, errMsg);
80+
std::sgring errmsg;
81+
int ret = gen_sig(140000000, "xiaojun", key, 180*86400, sig, errmsg);
8282
if (0 != ret) {
83-
std::cout << "gen_sig_v2 failed " << ret << " " << errMsg << std::endl;
83+
std::cout << "gen_sig failed " << ret << " " << errmsg << std::endl;
8484
} else {
85-
std::cout << "gen_sig_v2 " << sig << std::endl;
85+
std::cout << "gen_sig " << sig << std::endl;
8686
}
8787

8888
```

‎build_debug_x64.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ set PREBUILD_DIR=tls-sig-api_%ARCH%
2121
mkdir %PREBUILD_DIR%\%BUILD_TYPE%
2222
xcopy %BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
2323
xcopy third\%ZLIB%\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24-
xcopy third\%MBEDTLS%\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24+
xcopy third\%MBEDTLS%\crypto\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y

‎build_debug_x86.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ set PREBUILD_DIR=tls-sig-api_%ARCH%
2121
mkdir %PREBUILD_DIR%\%BUILD_TYPE%
2222
xcopy %BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
2323
xcopy third\%ZLIB%\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24-
xcopy third\%MBEDTLS%\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24+
xcopy third\%MBEDTLS%\crypto\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y

‎build_release_x64.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ set PREBUILD_DIR=tls-sig-api_%ARCH%
2121
mkdir %PREBUILD_DIR%\%BUILD_TYPE%
2222
xcopy %BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
2323
xcopy third\%ZLIB%\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24-
xcopy third\%MBEDTLS%\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24+
xcopy third\%MBEDTLS%\crypto\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y

‎build_release_x86.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ set PREBUILD_DIR=tls-sig-api_%ARCH%
2121
mkdir %PREBUILD_DIR%\%BUILD_TYPE%
2222
xcopy %BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
2323
xcopy third\%ZLIB%\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24-
xcopy third\%MBEDTLS%\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y
24+
xcopy third\%MBEDTLS%\crypto\library\%BUILD_TYPE%\* %PREBUILD_DIR%\%BUILD_TYPE% /E /Y

0 commit comments

Comments
 (0)