mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
330 lines
9.1 KiB
Diff
330 lines
9.1 KiB
Diff
From ef218059ebea8a860dea6b12a7b28984c51d2777 Mon Sep 17 00:00:00 2001
|
|
From: Derek Lesho <dlesho@codeweavers.com>
|
|
Date: Fri, 2 Oct 2020 11:29:24 -0500
|
|
Subject: [PATCH] bcrypt: Allow multiple backends to coexist.
|
|
|
|
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
|
|
---
|
|
dlls/bcrypt/Makefile.in | 3 +-
|
|
dlls/bcrypt/bcrypt_internal.h | 3 +
|
|
dlls/bcrypt/gnutls.c | 32 ++++--
|
|
dlls/bcrypt/macos.c | 18 +++-
|
|
dlls/bcrypt/unixlib.c | 194 ++++++++++++++++++++++++++++++++++
|
|
5 files changed, 235 insertions(+), 15 deletions(-)
|
|
create mode 100644 dlls/bcrypt/unixlib.c
|
|
|
|
diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
|
|
index 24803fb2d7c..46a20d473dd 100644
|
|
--- a/dlls/bcrypt/Makefile.in
|
|
+++ b/dlls/bcrypt/Makefile.in
|
|
@@ -11,6 +11,7 @@ C_SRCS = \
|
|
macos.c \
|
|
md2.c \
|
|
sha256.c \
|
|
- sha512.c
|
|
+ sha512.c \
|
|
+ unixlib.c
|
|
|
|
RC_SRCS = version.rc
|
|
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
|
|
index 463672db470..90551868cf0 100644
|
|
--- a/dlls/bcrypt/bcrypt_internal.h
|
|
+++ b/dlls/bcrypt/bcrypt_internal.h
|
|
@@ -215,4 +215,7 @@ struct key_funcs
|
|
NTSTATUS (CDECL *key_import_ecc)( struct key *, UCHAR *, ULONG );
|
|
};
|
|
|
|
+struct key_funcs *gnutls_lib_init(DWORD reason);
|
|
+struct key_funcs *macos_lib_init(DWORD reason);
|
|
+
|
|
#endif /* __BCRYPT_INTERNAL_H */
|
|
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
|
|
index 5ed51e8704c..7a1eada329c 100644
|
|
--- a/dlls/bcrypt/gnutls.c
|
|
+++ b/dlls/bcrypt/gnutls.c
|
|
@@ -347,9 +347,12 @@ fail:
|
|
|
|
static void gnutls_uninitialize(void)
|
|
{
|
|
- pgnutls_global_deinit();
|
|
- dlclose( libgnutls_handle );
|
|
- libgnutls_handle = NULL;
|
|
+ if (libgnutls_handle)
|
|
+ {
|
|
+ pgnutls_global_deinit();
|
|
+ dlclose( libgnutls_handle );
|
|
+ libgnutls_handle = NULL;
|
|
+ }
|
|
}
|
|
|
|
struct buffer
|
|
@@ -1848,19 +1851,28 @@ static const struct key_funcs key_funcs =
|
|
key_import_ecc
|
|
};
|
|
|
|
-NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
|
|
+struct key_funcs * gnutls_lib_init( DWORD reason )
|
|
{
|
|
switch (reason)
|
|
{
|
|
case DLL_PROCESS_ATTACH:
|
|
- if (!gnutls_initialize()) return STATUS_DLL_NOT_FOUND;
|
|
- *(const struct key_funcs **)ptr_out = &key_funcs;
|
|
- break;
|
|
+ if (!gnutls_initialize()) return NULL;
|
|
+ return &key_funcs;
|
|
case DLL_PROCESS_DETACH:
|
|
gnutls_uninitialize();
|
|
- break;
|
|
}
|
|
- return STATUS_SUCCESS;
|
|
+ return NULL;
|
|
}
|
|
|
|
-#endif /* HAVE_GNUTLS_CIPHER_INIT */
|
|
+#else /* HAVE_GNUTLS_CIPHER_INIT */
|
|
+#include "ntstatus.h"
|
|
+#define WIN32_NO_STATUS
|
|
+#include "windef.h"
|
|
+#include "winbase.h"
|
|
+#include "winternl.h"
|
|
+
|
|
+struct key_funcs * gnutls_lib_init( DWORD reason )
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
+#endif
|
|
diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
|
|
index d8bba46ad5c..8df5ca8645f 100644
|
|
--- a/dlls/bcrypt/macos.c
|
|
+++ b/dlls/bcrypt/macos.c
|
|
@@ -287,11 +287,21 @@ static const struct key_funcs key_funcs =
|
|
key_import_ecc
|
|
};
|
|
|
|
-NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
|
|
+struct key_funcs * macos_lib_init( DWORD reason )
|
|
{
|
|
- if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS;
|
|
- *(const struct key_funcs **)ptr_out = &key_funcs;
|
|
- return STATUS_SUCCESS;
|
|
+ if (reason != DLL_PROCESS_ATTACH) return NULL;
|
|
+ return &key_funcs;
|
|
}
|
|
|
|
+#else
|
|
+#include "ntstatus.h"
|
|
+#define WIN32_NO_STATUS
|
|
+#include "windef.h"
|
|
+#include "winbase.h"
|
|
+#include "winternl.h"
|
|
+
|
|
+struct key_funcs * macos_lib_init( DWORD reason )
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
#endif
|
|
diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
|
|
new file mode 100644
|
|
index 00000000000..a158ec1630a
|
|
--- /dev/null
|
|
+++ b/dlls/bcrypt/unixlib.c
|
|
@@ -0,0 +1,194 @@
|
|
+#if 0
|
|
+#pragma makedep unix
|
|
+#endif
|
|
+
|
|
+#include "config.h"
|
|
+#include "wine/port.h"
|
|
+
|
|
+#include <stdarg.h>
|
|
+
|
|
+#include "ntstatus.h"
|
|
+#define WIN32_NO_STATUS
|
|
+#include "windef.h"
|
|
+#include "winbase.h"
|
|
+#include "ntsecapi.h"
|
|
+#include "bcrypt.h"
|
|
+
|
|
+#include "bcrypt_internal.h"
|
|
+
|
|
+#include "wine/debug.h"
|
|
+#include "wine/unicode.h"
|
|
+
|
|
+#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 || defined(HAVE_GNUTLS_CIPHER_INIT)
|
|
+WINE_DEFAULT_DEBUG_CHANNEL(bcrypt);
|
|
+
|
|
+static NTSTATUS CDECL key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_symmetric_init( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static void CDECL key_symmetric_vector_reset( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static void CDECL key_symmetric_destroy( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_asymmetric_init( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output,
|
|
+ ULONG output_len, ULONG *ret_len, ULONG flags )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len,
|
|
+ UCHAR *signature, ULONG signature_len, DWORD flags )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_export_ecc( struct key *key, UCHAR *output, ULONG len, ULONG *ret_len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_import_ecc( struct key *key, UCHAR *input, ULONG len )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_asymmetric_generate( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key *key_copy )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+ return STATUS_NOT_IMPLEMENTED;
|
|
+}
|
|
+
|
|
+static void CDECL key_asymmetric_destroy( struct key *key )
|
|
+{
|
|
+ FIXME( "not implemented\n" );
|
|
+}
|
|
+
|
|
+static struct key_funcs key_funcs =
|
|
+{
|
|
+ key_set_property,
|
|
+ key_symmetric_init,
|
|
+ key_symmetric_vector_reset,
|
|
+ key_symmetric_set_auth_data,
|
|
+ key_symmetric_encrypt,
|
|
+ key_symmetric_decrypt,
|
|
+ key_symmetric_get_tag,
|
|
+ key_symmetric_destroy,
|
|
+ key_asymmetric_init,
|
|
+ key_asymmetric_generate,
|
|
+ key_asymmetric_duplicate,
|
|
+ key_asymmetric_sign,
|
|
+ key_asymmetric_verify,
|
|
+ key_asymmetric_destroy,
|
|
+ key_export_dsa_capi,
|
|
+ key_export_ecc,
|
|
+ key_import_dsa_capi,
|
|
+ key_import_ecc
|
|
+};
|
|
+
|
|
+NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
|
|
+{
|
|
+ struct key_funcs *gnutls_funcs = gnutls_lib_init(reason);
|
|
+ struct key_funcs *macos_funcs = macos_lib_init(reason);
|
|
+
|
|
+ if (reason == DLL_PROCESS_ATTACH)
|
|
+ {
|
|
+#define RESOLVE_FUNC(name) \
|
|
+ if (macos_funcs && macos_funcs->key_##name) \
|
|
+ key_funcs.key_##name = macos_funcs->key_##name; \
|
|
+ if (gnutls_funcs && gnutls_funcs->key_##name) \
|
|
+ key_funcs.key_##name = gnutls_funcs->key_##name;
|
|
+
|
|
+ RESOLVE_FUNC(set_property)
|
|
+ RESOLVE_FUNC(symmetric_init)
|
|
+ RESOLVE_FUNC(symmetric_vector_reset)
|
|
+ RESOLVE_FUNC(symmetric_set_auth_data)
|
|
+ RESOLVE_FUNC(symmetric_encrypt)
|
|
+ RESOLVE_FUNC(symmetric_decrypt)
|
|
+ RESOLVE_FUNC(symmetric_get_tag)
|
|
+ RESOLVE_FUNC(symmetric_destroy)
|
|
+ RESOLVE_FUNC(asymmetric_init)
|
|
+ RESOLVE_FUNC(asymmetric_generate)
|
|
+ RESOLVE_FUNC(asymmetric_duplicate)
|
|
+ RESOLVE_FUNC(asymmetric_sign)
|
|
+ RESOLVE_FUNC(asymmetric_verify)
|
|
+ RESOLVE_FUNC(asymmetric_destroy)
|
|
+ RESOLVE_FUNC(export_dsa_capi)
|
|
+ RESOLVE_FUNC(export_ecc)
|
|
+ RESOLVE_FUNC(import_dsa_capi)
|
|
+ RESOLVE_FUNC(import_ecc)
|
|
+
|
|
+#undef RESOLVE_FUNC
|
|
+
|
|
+ *(struct key_funcs **)ptr_out = &key_funcs;
|
|
+ }
|
|
+
|
|
+ return STATUS_SUCCESS;
|
|
+}
|
|
+
|
|
+#endif
|
|
--
|
|
2.28.0
|
|
|