xmlsecurity/source/helper/documentsignaturehelper.cxx | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit b0351f6d57a78dc85cdc2740958d260f4aa1e058
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Mon Jun 26 15:47:48 2017 +0200
Cleanup comment
Change-Id: I218675bcb832c158171f87bb7c52a658ceaa7a67
Reviewed-on: https://gerrit.libreoffice.org/39278
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 1d8d1c0d72cb..618b69445222 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -77,14 +77,7 @@ int compareVersions(
return 0;
}
}
-//If the OOo 3.0 mode is used then we exclude
-//'mimetype' and all content of 'META-INF'.
-//If the argument 'bSigning' is true then the element list is created for a
signing
-//operation in which case we use the latest signing algorithm. That is all
elements
-//we find in the zip storage are added to the list. We do not support the old
signatures
-//which did not contain all files.
-//If 'bSigning' is false, then we validate. If the user enabled validating
according to OOo 3.0
-//then mimetype and all content of META-INF must be excluded.
+
void ImplFillElementList(
std::vector< OUString >& rList, const Reference < css::embed::XStorage >&
rxStore,
const OUString& rRootStorageName, const bool bRecursive,
@@ -101,6 +94,8 @@ void ImplFillElementList(
// OOXML
continue;
+ // If the user enabled validating according to OOo 3.0
+ // then mimetype and all content of META-INF must be excluded.
if (mode != DocumentSignatureAlgorithm::OOo3_2
&& (pNames[n] == "META-INF" || pNames[n] == "mimetype"))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
