[shiftmedia-libgnutls] Fix warnings when compile with curl (#40064)

This commit is contained in:
talregev 2024-07-30 09:04:27 +03:00 committed by GitHub
parent 62e2aac92b
commit a77d228511
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,32 @@
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index 9e271476cf..80d8ccc8f5 100644
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -224,9 +224,9 @@ int gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_const_t resp, unsigned indx,
gnutls_datum_t *issuer_name_hash,
gnutls_datum_t *issuer_key_hash,
gnutls_datum_t *serial_number,
- unsigned int *cert_status, time_t *this_update,
+ gnutls_ocsp_cert_status_t *cert_status, time_t *this_update,
time_t *next_update, time_t *revocation_time,
- unsigned int *revocation_reason);
+ gnutls_x509_crl_reason_t *revocation_reason);
int gnutls_ocsp_resp_get_extension(gnutls_ocsp_resp_const_t resp, unsigned indx,
gnutls_datum_t *oid, unsigned int *critical,
gnutls_datum_t *data);
diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index 0120129d50..3a46f2d174 100644
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -1433,9 +1433,9 @@ int gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_const_t resp, unsigned indx,
gnutls_datum_t *issuer_name_hash,
gnutls_datum_t *issuer_key_hash,
gnutls_datum_t *serial_number,
- unsigned int *cert_status, time_t *this_update,
+ gnutls_ocsp_cert_status_t *cert_status, time_t *this_update,
time_t *next_update, time_t *revocation_time,
- unsigned int *revocation_reason)
+ gnutls_x509_crl_reason_t *revocation_reason)
{
char name[MAX_NAME_SIZE];
int ret, result;

View File

@ -10,6 +10,7 @@ vcpkg_from_github(
external-libtasn1.patch
pkgconfig.patch
ssize_t_already_define.patch
fix-warnings.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm")

View File

@ -1,6 +1,7 @@
{
"name": "shiftmedia-libgnutls",
"version": "3.8.4",
"port-version": 1,
"description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
"homepage": "https://github.com/ShiftMediaProject/gnutls",
"license": "LGPL-2.1-only",

View File

@ -8182,7 +8182,7 @@
},
"shiftmedia-libgnutls": {
"baseline": "3.8.4",
"port-version": 0
"port-version": 1
},
"shiftmedia-libgpg-error": {
"baseline": "1.45",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a784f9e85e153f86f04458fed9d158e76b861eda",
"version": "3.8.4",
"port-version": 1
},
{
"git-tree": "f2138ba71b3282796cf9ee0318ec585fc0482281",
"version": "3.8.4",