April 2021 - Wine-commits - list.winehq.org

Hans Leidekker : wldap32: Avoid a crash with tracing on.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 885c480d2e63895693b51a858f0745d2fd2468b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=885c480d2e63895693b51a85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 11:42:20 2021 +0200 wldap32: Avoid a crash with tracing on. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 1037b73174b..0f3d10e1204 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -368,9 +368,10 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) { char *attrs[] = { (char *)"supportedControl", NULL }; void *res, *entry; + struct bervalU **ctrls = SERVER_CTRLS(ld); ULONG ret; - if (SERVER_CTRLS(ld)) return TRUE; + if (ctrls) return TRUE; ret = map_error( ldap_funcs->fn_ldap_search_ext_s( CTX(ld), (char *)"", LDAP_SCOPE_BASE, (char *)"(objectClass=*)", attrs, FALSE, NULL, NULL, NULL, 0, &res ) ); @@ -380,17 +381,14 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) if (entry) { ULONG count, i; - struct bervalU **ctrls = SERVER_CTRLS(ld); - - *(struct bervalU ***)&SERVER_CTRLS(ld) = ldap_funcs->fn_ldap_get_values_len( CTX(ld), entry, attrs[0] ); - count = ldap_funcs->fn_ldap_count_values_len( SERVER_CTRLS(ld) ); - for (i = 0; i < count; i++) - TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + ctrls = ldap_funcs->fn_ldap_get_values_len( CTX(ld), entry, attrs[0] ); + count = ldap_funcs->fn_ldap_count_values_len( ctrls ); + for (i = 0; i < count; i++) TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + *(struct bervalU ***)&SERVER_CTRLS(ld) = ctrls; } ldap_funcs->fn_ldap_msgfree( res ); - - return SERVER_CTRLS(ld) != NULL; + return ctrls != NULL; } static BOOL is_supported_server_ctrls( LDAP *ld, LDAPControlU **ctrls )

1 0

Hans Leidekker : kerberos: Move support for SpAcquireCredentialsHandle/SpFreeCredentialsHandle to a new Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 6e9a9d670185f5a18d860602eb23e5a4c0fc1c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9a9d670185f5a18d860602… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:48 2021 +0200 kerberos: Move support for SpAcquireCredentialsHandle/SpFreeCredentialsHandle to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 3 +- dlls/kerberos/krb5_ap.c | 194 +++++++--------------- dlls/kerberos/unixlib.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 29 ++++ 4 files changed, 494 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e9a9d670185f5a18d86…

1 0

Hans Leidekker : kerberos: Move support for SpInitLsaModeContext/SpDeleteContext to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f9292ec8b672c6325b6561ad71e35d19011dbda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9292ec8b672c6325b6561ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:49 2021 +0200 kerberos: Move support for SpInitLsaModeContext/SpDeleteContext to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 135 ++++-------------------------------------------- dlls/kerberos/unixlib.c | 116 +++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 3 ++ 3 files changed, 130 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9292ec8b672c6325b65…

1 0

Hans Leidekker : kerberos: Move support for SpAcceptLsaModeContext to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: e6aa95c08a73a70dad378a1b040f430cbead9b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6aa95c08a73a70dad378a1b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:50 2021 +0200 kerberos: Move support for SpAcceptLsaModeContext to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 102 ++++-------------------------------------------- dlls/kerberos/unixlib.c | 63 ++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 2 + 3 files changed, 72 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6aa95c08a73a70dad37…

1 0

Hans Leidekker : kerberos: Move support for SpMakeSignature to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 712dfa4660c2599e9f57d7d3b791739ae8ddb900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712dfa4660c2599e9f57d7d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:51 2021 +0200 kerberos: Move support for SpMakeSignature to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 35 +---------------------------------- dlls/kerberos/unixlib.c | 30 ++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 9915cca283d..7394f05bd2b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1036,57 +1036,24 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_table; *table_count = 1; - return STATUS_SUCCESS; } static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); - return STATUS_SUCCESS; } static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status; - gss_buffer_desc data_buffer, token_buffer; - gss_ctx_id_t ctxt_handle; - int data_idx, token_idx; - TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = message->pBuffers[data_idx].cbBuffer; - data_buffer.value = message->pBuffers[data_idx].pvBuffer; - - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - token_buffer.length = 0; - token_buffer.value = NULL; - - ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); - TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE) - { - memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); - message->pBuffers[token_idx].cbBuffer = token_buffer.length; - pgss_release_buffer( &minor_status, &token_buffer ); - } - - return status_gss_to_sspi( ret ); -#else - FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->make_signature( context, message ); } static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 04bff0b032e..f67f22ad8d8 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -558,6 +558,35 @@ static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HAN return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctx_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( msg->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + msg->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -565,6 +594,7 @@ static const struct krb5_funcs funcs = delete_context, free_credentials_handle, initialize_context, + make_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 88d13ce8aab..da487bb781e 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -29,6 +29,7 @@ struct krb5_funcs NTSTATUS (CDECL *free_credentials_handle)(LSA_SEC_HANDLE); NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); + NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); }; extern const struct krb5_funcs *krb5_funcs;

1 0

Hans Leidekker : kerberos: Move support for SpVerifySignature to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: afa5c6450875c8ec2139b810c531ecba08a5bebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa5c6450875c8ec2139b810… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:52 2021 +0200 kerberos: Move support for SpVerifySignature to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 27 +-------------------------- dlls/kerberos/unixlib.c | 24 ++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7394f05bd2b..f3cbf34ee81 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1059,36 +1059,11 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status; - gss_buffer_desc data_buffer, token_buffer; - gss_ctx_id_t ctxt_handle; - int data_idx, token_idx; - TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = message->pBuffers[data_idx].cbBuffer; - data_buffer.value = message->pBuffers[data_idx].pvBuffer; - - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - token_buffer.length = message->pBuffers[token_idx].cbBuffer; - token_buffer.value = message->pBuffers[token_idx].pvBuffer; - - ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); - TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; - - return status_gss_to_sspi( ret ); -#else - FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->verify_signature( context, message, quality_of_protection ); } #ifdef SONAME_LIBGSSAPI_KRB5 diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index f67f22ad8d8..06f0ffc8a04 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -587,6 +587,29 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = msg->pBuffers[token_idx].cbBuffer; + token_buffer.value = msg->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE && qop) *qop = 0; + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -595,6 +618,7 @@ static const struct krb5_funcs funcs = free_credentials_handle, initialize_context, make_signature, + verify_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index da487bb781e..6a73444aae8 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -30,6 +30,7 @@ struct krb5_funcs NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); + NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); }; extern const struct krb5_funcs *krb5_funcs;

1 0

Andrey Gusev : wldap32: Remove redundant 'break' statement.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 78866a7b87d8569c18e11b934178a2751ad9496f URL: https://source.winehq.org/git/wine.git/?a=commit;h=78866a7b87d8569c18e11b93… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 20 17:10:28 2021 +0300 wldap32: Remove redundant 'break' statement. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 0f3d10e1204..ec3830d4ab3 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -467,7 +467,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) else FIXME("upgrading referral value %p to LDAP_OPT_ON (OpenLDAP lacks sufficient granularity)\n", value); return map_error( ldap_funcs->fn_ldap_set_option( CTX(ld), option, openldap_referral ) ); - break; } case LDAP_OPT_DEREF: case LDAP_OPT_DESC:

1 0

Hans Leidekker : bcrypt: Decryption with asymmetric keys is supported.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 3deb961583046635d1be7468cf91bbe22f0d9a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3deb961583046635d1be7468… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 16:53:31 2021 +0200 bcrypt: Decryption with asymmetric keys is supported. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a1423dcd836..6729edf671f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1240,24 +1240,6 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - - return status; -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - return key_is_symmetric( key ) ? key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, - output, output_len, ret_len, flags ) : key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); -} - static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1733,6 +1715,23 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } +static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + NTSTATUS status; + if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) + *ret_len = output_len; + return status; +} + +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + if (key_is_symmetric( key )) + return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); +} + NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { @@ -1742,11 +1741,6 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!key_is_symmetric( key )) - { - FIXME( "decryption with asymmetric keys not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags );

1 0

Hans Leidekker : bcrypt: Pass output length as a separate parameter to key_asymmetric_decrypt.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: ae194f6997ec7cd14ce361deda9e1a987d080d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae194f6997ec7cd14ce361de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 16:53:32 2021 +0200 bcrypt: Pass output length as a separate parameter to key_asymmetric_decrypt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +---------- dlls/bcrypt/gnutls.c | 18 ++++++------------ 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index eb136111509..fef1e4585ee 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -206,7 +206,7 @@ struct key_funcs void (CDECL *key_symmetric_destroy)( struct key * ); NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); - NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG * ); + NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); NTSTATUS (CDECL *key_asymmetric_sign)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ); NTSTATUS (CDECL *key_asymmetric_verify)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6729edf671f..59835014530 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1715,21 +1715,12 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - return status; -} - static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { if (key_is_symmetric( key )) return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2f0c62bc6da..9c1e7b5ab06 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1846,32 +1846,26 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key return STATUS_SUCCESS; } -static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, - UCHAR *output, ULONG *output_len ) +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) { gnutls_datum_t e, d = { 0 }; NTSTATUS status = STATUS_SUCCESS; int ret; - e.data = (unsigned char *)input; + e.data = input; e.size = input_len; - if ((ret = pgnutls_privkey_decrypt_data( key_data(key)->privkey, 0, &e, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - if (*output_len >= d.size) - { - *output_len = d.size; - memcpy( output, d.data, *output_len ); - } - else - status = STATUS_BUFFER_TOO_SMALL; + *ret_len = d.size; + if (output_len >= d.size) memcpy( output, d.data, *ret_len ); + else status = STATUS_BUFFER_TOO_SMALL; free( d.data ); - return status; }

1 0

Paul Gofman : bcrypt: Synchronize symmetric key access for encrypt and decrypt.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9944a7c92bb23b877d567ccc5d901b5df0325b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9944a7c92bb23b877d567ccc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 20 16:53:33 2021 +0200 bcrypt: Synchronize symmetric key access for encrypt and decrypt. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index fef1e4585ee..61c367cae9d 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -164,6 +164,7 @@ struct key_symmetric ULONG vector_len; UCHAR *secret; ULONG secret_len; + CRITICAL_SECTION cs; }; #define KEY_FLAG_LEGACY_DSA_V2 0x00000001 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 59835014530..5eb50cd616b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1090,8 +1090,8 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; @@ -1462,6 +1462,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; + InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; key->alg_id = alg->id; key->u.s.mode = alg->mode; @@ -1570,6 +1571,7 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) key_copy->u.s.block_size = key_orig->u.s.block_size; key_copy->u.s.secret = buffer; key_copy->u.s.secret_len = key_orig->u.s.secret_len; + InitializeCriticalSection( &key_copy->u.s.cs ); } else { @@ -1595,6 +1597,7 @@ static void key_destroy( struct key *key ) key_funcs->key_symmetric_destroy( key ); heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); } else { @@ -1696,6 +1699,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key *key = handle; + NTSTATUS ret; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); @@ -1712,15 +1716,10 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - if (key_is_symmetric( key )) - return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, @@ -1738,7 +1737,16 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + if (key_is_symmetric( key )) + { + NTSTATUS ret; + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; + } + + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )

1 0