Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9bbe5c36
Commit
9bbe5c36
authored
Feb 08, 2019
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Feb 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
secur32: Fix compile error on older gnutls.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c74c8800
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
2 deletions
+22
-2
schannel_gnutls.c
dlls/secur32/schannel_gnutls.c
+22
-2
No files found.
dlls/secur32/schannel_gnutls.c
View file @
9bbe5c36
...
...
@@ -51,6 +51,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
/* Not present in gnutls version < 2.9.10. */
static
int
(
*
pgnutls_cipher_get_block_size
)(
gnutls_cipher_algorithm_t
);
/* Not present in gnutls version < 3.3.0. */
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
*
);
/* Not present in gnutls version < 3.4.0. */
static
int
(
*
pgnutls_privkey_export_x509
)(
gnutls_privkey_t
,
gnutls_x509_privkey_t
*
);
...
...
@@ -79,7 +86,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 +144,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 +913,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 +939,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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment