mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:59:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[wolfssl] fix windows build (#33752)

Browse Source
This commit is contained in:
autoantwort 2023-09-14 01:04:07 +02:00 committed by GitHub
parent 2e9facbca2
commit b8ef3f52bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ports/wolfssl/fix-windows-build.patch Normal file
View File

@ -0,0 +1,49 @@
diff --git a/wolfcrypt/src/chacha20_poly1305.c b/wolfcrypt/src/chacha20_poly1305.c
index e4ebd10165f..0c37de747af 100644
--- a/wolfcrypt/src/chacha20_poly1305.c
+++ b/wolfcrypt/src/chacha20_poly1305.c
@@ -355,9 +355,9 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot(
int isEncrypt)
{
int ret;
- ssize_t dst_len = isEncrypt ?
- (ssize_t)src_len + POLY1305_DIGEST_SIZE :
- (ssize_t)src_len - POLY1305_DIGEST_SIZE;
+ long int dst_len = isEncrypt ?
+ (long int)src_len + POLY1305_DIGEST_SIZE :
+ (long int)src_len - POLY1305_DIGEST_SIZE;
const byte *src_i;
byte *dst_i;
size_t src_len_rem;
@@ -375,7 +375,7 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot(
goto out;
}
- if ((ssize_t)dst_space < dst_len) {
+ if ((long int)dst_space < dst_len) {
ret = BUFFER_E;
goto out;
}
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 47e3b7363af..feeefe4a2ce 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -1876,11 +1876,13 @@ extern void uITRON4_free(void *p) ;
#endif
#endif
-#ifdef _MSC_VER
- #ifndef HAVE_SSIZE_T
- #include <BaseTsd.h>
- typedef SSIZE_T ssize_t;
- #endif
+#if defined(NO_WC_SSIZE_TYPE) || defined(ssize_t)
+ /* ssize_t comes from system headers or user_settings.h */
+#elif defined(WC_SSIZE_TYPE)
+ typedef WC_SSIZE_TYPE ssize_t;
+#elif defined(_MSC_VER)
+ #include <BaseTsd.h>
+ typedef SSIZE_T ssize_t;
#endif
/* If DCP is used without SINGLE_THREADED, enforce WOLFSSL_CRYPT_HW_MUTEX */

1
ports/wolfssl/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
warning-and-include.patch
fix-windows-build.patch # From https://github.com/wolfSSL/wolfssl/pull/6509
)
vcpkg_cmake_configure(

1
ports/wolfssl/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "wolfssl",
"version": "5.6.3",
"port-version": 1,
"description": "TLS and Cryptographic library for many platforms",
"homepage": "https://wolfssl.com",
"license": "GPL-2.0-or-later",

2
versions/baseline.json
View File

@ -8822,7 +8822,7 @@
},
"wolfssl": {
"baseline": "5.6.3",
"port-version": 0
"port-version": 1
},
"wolftpm": {
"baseline": "2.7.0",

5
versions/w-/wolfssl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b1ed14c731f84f9a8f885e9bf40898c318bd4986",
"version": "5.6.3",
"port-version": 1
},
{
"git-tree": "e809eb7090657113c8f628ce22975c7f3bd3dbfd",
"version": "5.6.3",