From e2a1bc6e6a37ecec96fe410650bbe81b1f9285c5 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Fri, 30 Jun 2023 15:53:46 -0700 Subject: [PATCH 1/2] fix warning for build with vcpkg --- wolfcrypt/src/asn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 96f27928d9..51e6205cf9 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -30431,9 +30431,9 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid, ext = &cert->customCertExt[cert->customCertExtCount]; - ext->oid = oid; + ext->oid = (char*)oid; ext->crit = (critical == 0) ? 0 : 1; - ext->val = der; + ext->val = (byte*)der; ext->valSz = derSz; cert->customCertExtCount++; From ff38d8f01867a652ca7a4933421a9154618d42dc Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Fri, 14 Jul 2023 13:27:38 -0600 Subject: [PATCH 2/2] revert portion of cmake for vcpkg build --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cafb4a0aa..88a130991e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2371,8 +2371,7 @@ install(FILES # Install the export set install(EXPORT wolfssl-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl - FILE wolfssl-targets.cmake - NAMESPACE wolfssl::) + FILE wolfssl-config.cmake) # TODO: Distro build + rules for what to include in the distro. # See various include.am files.