wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for CMake to only set ranlib arguments for Mac. Fix for stray typo of , -> ;. Fixes #3275 and Fixes #3278

Browse Source
This commit is contained in:
David Garske
2020-09-08 11:07:12 -07:00
parent 7fd51cf9d9
commit 6f5a7e87c5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -30,11 +30,13 @@ find_package (Threads)
#################################################### ####################################################
# Let CMake choose default compiler # Let CMake choose default compiler
# Silence ranlib warning "has no symbols" if(APPLE)
SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") # Silence ranlib warning "has no symbols"
SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>") SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>") SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
endif()
#################################################### ####################################################
# Cross Compile Example # Cross Compile Example

2
src/ssl.c
View File

@ -26188,7 +26188,7 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509)
idx = ctx->certChain->length; idx = ctx->certChain->length;
} }
c32to24(derSz, chain + idx); c32to24(derSz, chain + idx);
idx += OPAQUE24_LEN, idx += OPAQUE24_LEN;
XMEMCPY(chain + idx, der, derSz); XMEMCPY(chain + idx, der, derSz);
idx += derSz; idx += derSz;
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13