From 1a69e83215ab29d0de698b8807429a23053de18f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 16 May 2021 23:37:01 +0200 Subject: [PATCH] debian/patches: Add 0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch. Fix Windows 10 logon when using an internal trusted root CA. --- ...989-Use-X509_STORE_set_default_paths.patch | 28 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 debian/patches/0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch diff --git a/debian/patches/0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch b/debian/patches/0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch new file mode 100644 index 0000000..7f46fa2 --- /dev/null +++ b/debian/patches/0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch @@ -0,0 +1,28 @@ +From eaadeff1fc529f73d01a2a9699f840171c654e38 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Mon, 3 May 2021 08:27:31 +0200 +Subject: [PATCH] Fixed #6989: Use X509_STORE_set_default_paths + +(cherry picked from commit b528ecde4f68d297b8464855a7ae0e02d36b78fc) +--- + libfreerdp/crypto/crypto.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index e61bd3bf1..82df956c2 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -846,9 +846,7 @@ BOOL x509_verify_certificate(CryptoCert cert, const char* certificate_store_path + NULL); + #endif + +- lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file()); +- +- if (lookup == NULL) ++ if (X509_STORE_set_default_paths(cert_ctx) != 1) + goto end; + + lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir()); +-- +2.30.2 + diff --git a/debian/patches/series b/debian/patches/series index 2f5bf4d..9edc801 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ 0032-Fixed-CodeQL-warnings.patch 0033-Reverted-winpr_BinToHexString-argument-change.patch 0034-Fixed-6938-Remote-app-mode-clipboard-fix.patch +0035-Fixed-6989-Use-X509_STORE_set_default_paths.patch