[Libreoffice-commits] core.git: xmlsecurity/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 19 05:52:24 UTC 2018


 xmlsecurity/source/helper/ooxmlsecexporter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02ae1077f118dc9d287913d99528de58f69852ce
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Sep 18 12:06:04 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Sep 19 07:52:00 2018 +0200

    SignatureType should be "2" for ooxml signatures
    
    This is what recent MS Office writes and means XmlDsig
    
    Change-Id: I053f4a3261d7925142666c7d1e2e7dbb51eaff57
    Reviewed-on: https://gerrit.libreoffice.org/60675
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 8e594cde62d6..5a3a8c293b0b 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -400,7 +400,7 @@ void OOXMLSecExporter::Impl::writeSignatureInfo()
     m_xDocumentHandler->characters("9"); // This is what MSO 2016 writes, though [MS-OFFCRYPTO] doesn't document what the value means.
     m_xDocumentHandler->endElement("SignatureProviderDetails");
     m_xDocumentHandler->startElement("SignatureType", uno::Reference<xml::sax::XAttributeList>(new SvXMLAttributeList()));
-    m_xDocumentHandler->characters("1");
+    m_xDocumentHandler->characters("2");
     m_xDocumentHandler->endElement("SignatureType");
 
     m_xDocumentHandler->endElement("SignatureInfoV1");


More information about the Libreoffice-commits mailing list