uunicorn-wine-modern-toolchain.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
  2. index 6afa558..37d5c33 100644
  3. --- a/dlls/bcrypt/gnutls.c
  4. +++ b/dlls/bcrypt/gnutls.c
  5. @@ -1031,7 +1031,7 @@ NTSTATUS get_gnutls_ecc_key_params(
  6. int ret;
  7. - if ((ret = pgnutls_privkey_export_ecc_raw( key->u.a.handle, &curve, x, y, d )))
  8. + if ((ret = pgnutls_privkey_export_ecc_raw( key->u.a.handle, curve, x, y, d )))
  9. {
  10. FIXME("pgnutls_privkey_export_ecc_raw: %s\n", pgnutls_strerror(ret));
  11. return STATUS_INTERNAL_ERROR;
  12. diff --git a/dlls/bcrypt/secrets.c b/dlls/bcrypt/secrets.c
  13. index a3f7922..c8a88f0 100644
  14. --- a/dlls/bcrypt/secrets.c
  15. +++ b/dlls/bcrypt/secrets.c
  16. @@ -24,6 +24,11 @@
  17. #include <openssl/err.h>
  18. #include <openssl/ec.h>
  19. +
  20. +#include <gnutls/abstract.h>
  21. +NTSTATUS get_gnutls_ecc_key_params(BCRYPT_KEY_HANDLE hKey,
  22. + gnutls_ecc_curve_t *curve,
  23. + gnutls_datum_t *x, gnutls_datum_t *y, gnutls_datum_t *d);
  24. #include <openssl/bn.h>
  25. #include <openssl/evp.h>
  26. #include <openssl/kdf.h>
  27. @@ -236,8 +241,8 @@ int ecc_sign(
  28. return -1;
  29. }
  30. - BIGNUM *r = NULL;
  31. - BIGNUM *s = NULL;
  32. + const BIGNUM *r = NULL;
  33. + const BIGNUM *s = NULL;
  34. pECDSA_SIG_get0(sig, &r, &s);
  35. diff --git a/dlls/bcrypt/secrets.h b/dlls/bcrypt/secrets.h
  36. index d1d8d83..56b4e11 100644
  37. --- a/dlls/bcrypt/secrets.h
  38. +++ b/dlls/bcrypt/secrets.h
  39. @@ -9,3 +9,9 @@ int ecc_sign(
  40. PUCHAR d, ULONG sd,
  41. PUCHAR src, ULONG src_len,
  42. PUCHAR dst);
  43. +
  44. +/* from gnutls.c - declared here so secrets.c can use it */
  45. +#include <gnutls/abstract.h>
  46. +NTSTATUS get_gnutls_ecc_key_params(BCRYPT_KEY_HANDLE hKey,
  47. + gnutls_ecc_curve_t *curve,
  48. + gnutls_datum_t *x, gnutls_datum_t *y, gnutls_datum_t *d);
  49. diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
  50. index 3d0129e..d92eb1a 100644
  51. --- a/dlls/crypt32/crypt32_private.h
  52. +++ b/dlls/crypt32/crypt32_private.h
  53. @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType,
  54. */
  55. HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID);
  56. -HINSTANCE hInstance DECLSPEC_HIDDEN;
  57. +extern HINSTANCE hInstance DECLSPEC_HIDDEN;
  58. void crypt_oid_init(void) DECLSPEC_HIDDEN;
  59. void crypt_oid_free(void) DECLSPEC_HIDDEN;