Skip to content

Commit 37be7a4

Browse files
authored
Merge pull request #6567 from JacobBarthelmeh/vcpkg
fix warning for build with vcpkg
2 parents a026d84 + ff38d8f commit 37be7a4

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,8 +2376,7 @@ install(FILES
23762376
# Install the export set
23772377
install(EXPORT wolfssl-targets
23782378
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl
2379-
FILE wolfssl-targets.cmake
2380-
NAMESPACE wolfssl::)
2379+
FILE wolfssl-config.cmake)
23812380

23822381
# TODO: Distro build + rules for what to include in the distro.
23832382
# See various include.am files.

wolfcrypt/src/asn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30686,9 +30686,9 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid,
3068630686

3068730687
ext = &cert->customCertExt[cert->customCertExtCount];
3068830688

30689-
ext->oid = oid;
30689+
ext->oid = (char*)oid;
3069030690
ext->crit = (critical == 0) ? 0 : 1;
30691-
ext->val = der;
30691+
ext->val = (byte*)der;
3069230692
ext->valSz = derSz;
3069330693

3069430694
cert->customCertExtCount++;

0 commit comments

Comments
 (0)