Blame SOURCES/0001-CVE-2022-26305-compare-authors-using-Thumbprint.patch

9d1203
From 77f30ada1156ca1e1357776fea8e9dc113f6898d Mon Sep 17 00:00:00 2001
9d1203
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
9d1203
Date: Thu, 3 Mar 2022 14:22:37 +0000
9d1203
Subject: [PATCH 1/4] CVE-2022-26305 compare authors using Thumbprint
9d1203
9d1203
Change-Id: I338f58eb07cbf0a3d13a7dafdaddac09252a8546
9d1203
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130929
9d1203
Tested-by: Jenkins
9d1203
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
9d1203
(cherry picked from commit 65442205b5b274ad309308162f150f8d41648f72)
9d1203
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130866
9d1203
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
9d1203
(cherry picked from commit a7aaa78acea4c1d51283c2fce54ff9f5339026f8)
9d1203
---
9d1203
 .../component/documentdigitalsignatures.cxx   | 23 +++++++++++++++----
9d1203
 1 file changed, 19 insertions(+), 4 deletions(-)
9d1203
9d1203
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
9d1203
index b9066ea92cac..5a21c8421bec 100644
9d1203
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
9d1203
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
9d1203
@@ -19,9 +19,10 @@
9d1203
 
9d1203
 #include <resourcemanager.hxx>
9d1203
 
9d1203
-#include <digitalsignaturesdialog.hxx>
9d1203
+#include <certificate.hxx>
9d1203
 #include <certificatechooser.hxx>
9d1203
 #include <certificateviewer.hxx>
9d1203
+#include <digitalsignaturesdialog.hxx>
9d1203
 #include <macrosecurity.hxx>
9d1203
 #include <biginteger.hxx>
9d1203
 #include <strings.hrc>
9d1203
@@ -666,9 +667,23 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
9d1203
     Sequence< SvtSecurityOptions::Certificate > aTrustedAuthors = SvtSecurityOptions().GetTrustedAuthors();
9d1203
 
9d1203
     return std::any_of(aTrustedAuthors.begin(), aTrustedAuthors.end(),
9d1203
-        [&xAuthor, &sSerialNum](const SvtSecurityOptions::Certificate& rAuthor) {
9d1203
-            return xmlsecurity::EqualDistinguishedNames(rAuthor[0], xAuthor->getIssuerName())
9d1203
-                && ( rAuthor[1] == sSerialNum );
9d1203
+        [this, &xAuthor, &sSerialNum](const SvtSecurityOptions::Certificate& rAuthor) {
9d1203
+            if (!xmlsecurity::EqualDistinguishedNames(rAuthor[0], xAuthor->getIssuerName()))
9d1203
+                return false;
9d1203
+            if (rAuthor[1] != sSerialNum)
9d1203
+                return false;
9d1203
+
9d1203
+            DocumentSignatureManager aSignatureManager(mxCtx, {});
9d1203
+            if (!aSignatureManager.init())
9d1203
+                return false;
9d1203
+            uno::Reference<css::security::XCertificate> xCert = aSignatureManager.getSecurityEnvironment()->createCertificateFromAscii(rAuthor[2]);
9d1203
+
9d1203
+            auto pAuthor = dynamic_cast<xmlsecurity::Certificate*>(xAuthor.get());
9d1203
+            auto pCert = dynamic_cast<xmlsecurity::Certificate*>(xCert.get());
9d1203
+            if (pAuthor && pCert)
9d1203
+                return pCert->getSHA256Thumbprint() == pAuthor->getSHA256Thumbprint();
9d1203
+
9d1203
+            return xCert->getSHA1Thumbprint() == xAuthor->getSHA1Thumbprint();
9d1203
         });
9d1203
 }
9d1203
 
9d1203
-- 
9d1203
2.37.1
9d1203