external/xmlsec/BCryptKeyDerivation.patch.1 | 51 ---------------------------- external/xmlsec/UnpackedTarball_xmlsec.mk | 2 - 2 files changed, 53 deletions(-)
New commits: commit 04957a8d32d21685d5e72ae1ae3e9f97df6ae47f Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> AuthorDate: Sun Dec 8 14:07:37 2024 +0200 Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> CommitDate: Sun Dec 8 15:37:54 2024 +0100 Drop BCryptKeyDerivation.patch.1 from xmlsec Change-Id: I161f3cfc334d6be0263536800cb028b8e7310823 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178080 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/external/xmlsec/BCryptKeyDerivation.patch.1 b/external/xmlsec/BCryptKeyDerivation.patch.1 deleted file mode 100644 index 3747915f87d2..000000000000 --- a/external/xmlsec/BCryptKeyDerivation.patch.1 +++ /dev/null @@ -1,51 +0,0 @@ -tdf#159519 Windows 7 does not have BCryptKeyDerivation - -It just occurred to me that these functions would of course not be called -by LibreOffice so this is untested. - ---- xmlsec/src/mscng/pbkdf2.c.orig 2024-02-21 19:02:56.539534152 +0100 -+++ xmlsec/src/mscng/pbkdf2.c 2024-02-21 19:01:03.282270354 +0100 -@@ -318,7 +318,20 @@ - } - - /* generate the output key */ -+#if 1 // _WIN32_WINNT <= 0x0601 -+ typedef NTSTATUS (WINAPI * BCryptKeyDerivationPtr)( -+ BCRYPT_KEY_HANDLE, BCryptBufferDesc *, PUCHAR, ULONG, ULONG *, ULONG); -+ HMODULE hBCrypt = GetModuleHandle("bcrypt.dll"); -+ BCryptKeyDerivationPtr pBCryptKeyDerivation = -+ (BCryptKeyDerivationPtr) GetProcAddress(hBCrypt, "BCryptKeyDerivation"); -+ if(NULL == pBCryptKeyDerivation) { -+ xmlSecMSCngNtError("BCryptKeyDerivation", NULL, status); -+ goto done; -+ } -+ status = (*pBCryptKeyDerivation)( -+#else - status = BCryptKeyDerivation( -+#endif - hKey, - ¶msPBKDF2, - pbOut, ---- xmlsec/src/mscng/concatkdf.c.orig 2024-02-21 19:02:37.962490885 +0100 -+++ xmlsec/src/mscng/concatkdf.c 2024-02-21 19:01:37.961351134 +0100 -@@ -318,7 +318,20 @@ - } - - /* generate the output key */ -+#if 1 // _WIN32_WINNT <= 0x0601 -+ typedef NTSTATUS (WINAPI * BCryptKeyDerivationPtr)( -+ BCRYPT_KEY_HANDLE, BCryptBufferDesc *, PUCHAR, ULONG, ULONG *, ULONG); -+ HMODULE hBCrypt = GetModuleHandle("bcrypt.dll"); -+ BCryptKeyDerivationPtr pBCryptKeyDerivation = -+ (BCryptKeyDerivationPtr) GetProcAddress(hBCrypt, "BCryptKeyDerivation"); -+ if(NULL == pBCryptKeyDerivation) { -+ xmlSecMSCngNtError("BCryptKeyDerivation", NULL, status); -+ goto done; -+ } -+ status = (*pBCryptKeyDerivation)( -+#else - status = BCryptKeyDerivation( -+#endif - hKey, - ¶msCONCATKDF2, - pbOut, diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk index 906aece5f7ed..77d3386b27dc 100644 --- a/external/xmlsec/UnpackedTarball_xmlsec.mk +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -10,8 +10,6 @@ xmlsec_patches := # Remove this when Ubuntu 20.04 is EOL in 2025. xmlsec_patches += old-nss.patch.1 -# Remove this when Windows 7 is no longer supported -xmlsec_patches += BCryptKeyDerivation.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))