[wolfssl] update to 5.6.4 (#34856)

This commit is contained in:
JacobBarthelmeh 2023-11-02 11:37:58 -06:00 committed by GitHub
parent 5a1a65b544
commit d70aa31127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 86 deletions

View File

@ -1,49 +0,0 @@
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 */

View File

@ -1,12 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wolfssl/wolfssl
REF v5.6.3-stable
SHA512 7c3b5c06ade7826031db089d50ec45c36970555499b6be94d1939b3002369fc98e503418128c6b2e253df7e92f86a71647d37f2cd27d57ac201e5aba32b879dc
REF v5.6.4-stable
SHA512 12d9dd264e005f04854d71ded629b20b9563a42b04bfbfd2879c4e3b121902edf2ac4349de27498cddd75d4d9fd742e8f78b82cd319c240485f69b4828e2c80c
HEAD_REF master
PATCHES
warning-and-include.patch
fix-windows-build.patch # From https://github.com/wolfSSL/wolfssl/pull/6509
)
vcpkg_cmake_configure(

View File

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

View File

@ -1,29 +0,0 @@
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 96f27928d90..51e6205cf9d 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++;
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index 8c323840584..a7d70e01fbf 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -26,6 +26,8 @@
#ifndef WOLFSSL_IO_H
#define WOLFSSL_IO_H
+#include <wolfssl/ssl.h>
+
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -9005,8 +9005,8 @@
"port-version": 0
},
"wolfssl": {
"baseline": "5.6.3",
"port-version": 1
"baseline": "5.6.4",
"port-version": 0
},
"wolftpm": {
"baseline": "2.7.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "65cc018a18a436969ef0fa7ff531d83994326f43",
"version": "5.6.4",
"port-version": 0
},
{
"git-tree": "b1ed14c731f84f9a8f885e9bf40898c318bd4986",
"version": "5.6.3",