wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7003ba44892d39ec0f409c793b97a0c5f4ae72d0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-01-31 11:08:09 +11:00
parent 46fc7a5a0d
commit 4839b31cec
5 changed files with 70 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/crypt32-old_libgnutls/0001-crypt32-Fix-compile-error-on-older-gnutls.patch
View File

@@ -1,26 +1,22 @@
From 778d6ea39b0c49f5000efd401f1ab05ec64c7abc Mon Sep 17 00:00:00 2001
From 2a88e8c6a5dc0d9b530664eda478088e7511c9e2 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 30 Jan 2019 10:20:49 +1100
Subject: [PATCH] crypt32: Fix compile error on older gnutls
Date: Thu, 31 Jan 2019 10:43:03 +1100
Subject: [PATCH] crypt32: Fix compile error on older gnutls.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/crypt32/pfx.c | 6 ++++++
1 file changed, 6 insertions(+)
dlls/crypt32/pfx.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c
index d824410..c4fb34d 100644
index cde2f19..46bf356 100644
--- a/dlls/crypt32/pfx.c
+++ b/dlls/crypt32/pfx.c
@@ -38,6 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt);
#ifdef SONAME_LIBGNUTLS
WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -45,6 +45,8 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password,
gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len,
gnutls_x509_crl_t * crl, unsigned int flags);
+/* Not present in gnutls version < 3.0 */
+int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password,
+ gnutls_x509_privkey_t *key, gnutls_x509_crt_t **chain, unsigned int *chain_len,
+ gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len,
+ gnutls_x509_crl_t * crl, unsigned int flags);
+int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t, unsigned int*);
+
static void *libgnutls_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f