Module: wine Branch: master Commit: d963d056a75ab8f83403f619a73fca5a0372f6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d963d056a75ab8f83403f619a...
Author: Eric Pouech eric.pouech@gmail.com Date: Tue Feb 1 14:06:15 2022 +0100
bcrypt: In unixlib, don't use Windows long type.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++----------- dlls/bcrypt/gnutls.c | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c0a53f9068b..6d115e10e54 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -155,7 +155,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - ULONG flags; + unsigned flags; };
struct key_symmetric @@ -165,7 +165,7 @@ struct key_symmetric UCHAR *vector; ULONG vector_len; UCHAR *secret; - ULONG secret_len; + unsigned secret_len; CRITICAL_SECTION cs; };
@@ -174,9 +174,9 @@ struct key_symmetric struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ - ULONG flags; + unsigned flags; UCHAR *pubkey; - ULONG pubkey_len; + unsigned pubkey_len; DSSSEED dss_seed; };
@@ -208,7 +208,7 @@ struct key_symmetric_encrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -217,7 +217,7 @@ struct key_symmetric_decrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -233,7 +233,7 @@ struct key_asymmetric_decrypt_params { struct key *key; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; @@ -250,11 +250,11 @@ struct key_asymmetric_sign_params struct key *key; void *padding; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; - ULONG flags; + unsigned flags; };
struct key_asymmetric_verify_params @@ -262,10 +262,10 @@ struct key_asymmetric_verify_params struct key *key; void *padding; UCHAR *hash; - ULONG hash_len; + unsigned hash_len; UCHAR *signature; ULONG signature_len; - ULONG flags; + unsigned flags; };
struct key_export_params diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 26da55ee758..56479197bf5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -610,7 +610,7 @@ static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d }
#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) -static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; gnutls_datum_t m, e; @@ -649,7 +649,7 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit }
static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey, - ULONG *pubkey_len ) + unsigned *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob = pubkey; gnutls_ecc_curve_t curve; @@ -709,7 +709,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ return STATUS_SUCCESS; }
-static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_DSA_KEY_BLOB *dsa_blob = pubkey; gnutls_datum_t p, q, g, y; @@ -773,8 +773,8 @@ static void reverse_bytes( UCHAR *buf, ULONG len ) }
#define Q_SIZE 20 -static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, - void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, unsigned bitlen, + void *pubkey, unsigned *pubkey_len ) { BLOBHEADER *hdr = pubkey; DSSPUBKEY *dsskey; @@ -1492,7 +1492,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) { const struct key_asymmetric_verify_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; gnutls_digest_algorithm_t hash_alg; gnutls_sign_algorithm_t sign_alg; gnutls_datum_t gnutls_hash, gnutls_signature; @@ -1644,7 +1644,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) { const struct key_asymmetric_sign_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; BCRYPT_PKCS1_PADDING_INFO *pad = params->padding; gnutls_datum_t hash, signature; gnutls_digest_algorithm_t hash_alg;