Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/secur32/schannel_gnutls.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10ac..d14e6f3 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -54,6 +54,12 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *);
+static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); @@ -79,7 +85,6 @@ MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_privkey_deinit); -MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); @@ -138,6 +143,16 @@ static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x5 return GNUTLS_E_UNKNOWN_PK_ALGORITHM; }
+static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *p1, + const gnutls_datum_t *p2, const gnutls_datum_t *p3, + const gnutls_datum_t *p4, const gnutls_datum_t *p5, + const gnutls_datum_t *p6, const gnutls_datum_t *p7, + const gnutls_datum_t *p8) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -897,7 +912,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_privkey_deinit) - LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); @@ -924,6 +938,11 @@ BOOL schan_imp_init(void) WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } + if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + }
ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS)
On Thu, 2019-02-07 at 23:41 +0000, Alistair Leslie-Hughes wrote:
+static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *,
const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *);
What version of GnuTLS is that? It would be nice to have a comment stating the version that makes the function available, like we have for the other functions that aren't available everywhere.
On 8/2/19 6:54 pm, Hans Leidekker wrote:
On Thu, 2019-02-07 at 23:41 +0000, Alistair Leslie-Hughes wrote:
+static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *,
const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *);What version of GnuTLS is that? It would be nice to have a comment stating the version that makes the function available, like we have for the other functions that aren't available everywhere.
I'm using Mint 17.3 which using the ubuntu trusty release
libgnutls-dev 3.2.11-2ubuntu1.1
It appears gnutls_privkey_import_rsa_raw was introduced
https://www.gnutls.org/abi-tracker/changelog/gnutls/3.4.4/log.html
Regards
Alistair.
On Fri, 2019-02-08 at 09:07 +0000, Alistair Leslie-Hughes wrote:
On 8/2/19 6:54 pm, Hans Leidekker wrote:
On Thu, 2019-02-07 at 23:41 +0000, Alistair Leslie-Hughes wrote:
+static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *,
const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *, const gnutls_datum_t *,const gnutls_datum_t *);What version of GnuTLS is that? It would be nice to have a comment stating the version that makes the function available, like we have for the other functions that aren't available everywhere.
I'm using Mint 17.3 which using the ubuntu trusty release
libgnutls-dev 3.2.11-2ubuntu1.1
It appears gnutls_privkey_import_rsa_raw was introduced
https://www.gnutls.org/abi-tracker/changelog/gnutls/3.4.4/log.html
That page says it was added in version 3.3.0 (released 2014-04-10). Could you add a comment and resubmit?
-
Alistair Leslie-Hughes -
Hans Leidekker