|
 |
ce6b02 |
From ae1bd20a2d4d7b7d64edc3b06d7f901c05175b7d Mon Sep 17 00:00:00 2001
|
|
|
ce6b02 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
ce6b02 |
Date: Mon, 20 Dec 2021 17:05:44 +0000
|
|
|
ce6b02 |
Subject: [PATCH] only use X509Data
|
|
|
ce6b02 |
|
|
|
ce6b02 |
Change-Id: I52e6588f5fac04bb26d77c1f3af470db73e41f72
|
|
|
ce6b02 |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127193
|
|
|
ce6b02 |
Tested-by: Jenkins
|
|
|
ce6b02 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
|
ce6b02 |
(cherry picked from commit be446d81e07b5499152efeca6ca23034e51ea5ff)
|
|
|
ce6b02 |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127178
|
|
|
ce6b02 |
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
|
ce6b02 |
(cherry picked from commit b0404f80577de9ff69e58390c6f6ef949fdb0139)
|
|
|
ce6b02 |
---
|
|
|
ce6b02 |
.../source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 6 ++++++
|
|
|
ce6b02 |
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 6 ++++++
|
|
|
ce6b02 |
2 files changed, 12 insertions(+)
|
|
|
ce6b02 |
|
|
|
ce6b02 |
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
|
|
|
ce6b02 |
index db400e6..39f9d7f 100644
|
|
|
ce6b02 |
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
|
|
|
ce6b02 |
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
|
|
|
ce6b02 |
@@ -21,6 +21,8 @@
|
|
|
ce6b02 |
#include <sal/log.hxx>
|
|
|
ce6b02 |
#include <rtl/uuid.h>
|
|
|
ce6b02 |
|
|
|
ce6b02 |
+#include <xmlsec/mscng/x509.h>
|
|
|
ce6b02 |
+
|
|
|
ce6b02 |
#include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
|
|
|
ce6b02 |
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
|
|
|
ce6b02 |
|
|
|
ce6b02 |
@@ -229,6 +231,10 @@ SAL_CALL XMLSignature_MSCryptImpl::validate(
|
|
|
ce6b02 |
// We do certificate verification ourselves.
|
|
|
ce6b02 |
pDsigCtx->keyInfoReadCtx.flags |= XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS;
|
|
|
ce6b02 |
|
|
|
ce6b02 |
+ // limit possible key data to valid X509 certificates only, no KeyValues
|
|
|
ce6b02 |
+ if (xmlSecPtrListAdd(&(pDsigCtx->keyInfoReadCtx.enabledKeyData), BAD_CAST xmlSecMSCngKeyDataX509GetKlass()) < 0)
|
|
|
ce6b02 |
+ throw RuntimeException("failed to limit allowed key data");
|
|
|
ce6b02 |
+
|
|
|
ce6b02 |
//Verify signature
|
|
|
ce6b02 |
//The documentation says that the signature is only valid if the return value is 0 (that is, not < 0)
|
|
|
ce6b02 |
//AND pDsigCtx->status == xmlSecDSigStatusSucceeded. That is, we must not make any assumptions, if
|
|
|
ce6b02 |
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
|
|
|
ce6b02 |
index 827580b..8f4d6f8 100644
|
|
|
ce6b02 |
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
|
|
|
ce6b02 |
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
|
|
|
ce6b02 |
@@ -19,6 +19,8 @@
|
|
|
ce6b02 |
|
|
|
ce6b02 |
#include <sal/config.h>
|
|
|
ce6b02 |
|
|
|
ce6b02 |
+#include <xmlsec/nss/x509.h>
|
|
|
ce6b02 |
+
|
|
|
ce6b02 |
#include <xmlelementwrapper_xmlsecimpl.hxx>
|
|
|
ce6b02 |
#include <xmlsec/xmlstreamio.hxx>
|
|
|
ce6b02 |
#include <xmlsec/errorcallback.hxx>
|
|
|
ce6b02 |
@@ -243,6 +245,10 @@ SAL_CALL XMLSignature_NssImpl::validate(
|
|
|
ce6b02 |
// We do certificate verification ourselves.
|
|
|
ce6b02 |
pDsigCtx->keyInfoReadCtx.flags |= XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS;
|
|
|
ce6b02 |
|
|
|
ce6b02 |
+ // limit possible key data to valid X509 certificates only, no KeyValues
|
|
|
ce6b02 |
+ if (xmlSecPtrListAdd(&(pDsigCtx->keyInfoReadCtx.enabledKeyData), BAD_CAST xmlSecNssKeyDataX509GetKlass()) < 0)
|
|
|
ce6b02 |
+ throw RuntimeException("failed to limit allowed key data");
|
|
|
ce6b02 |
+
|
|
|
ce6b02 |
//Verify signature
|
|
|
ce6b02 |
int rs = xmlSecDSigCtxVerify( pDsigCtx.get() , pNode );
|
|
|
ce6b02 |
|
|
|
ce6b02 |
--
|
|
|
ce6b02 |
2.33.1
|
|
|
ce6b02 |
|