From 81d3aefd8598fba835eeb21404fc4bd7dddf98b9 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 13 Sep 2024 09:02:16 +0200 Subject: [API CHANGE] XDocumentDigitalSignatures: remove deprecated / unused functions Some functions were already a stub and only aborted on calling them. The *Package* functions were added in commit c9ed2f359a9e899c3046c8151c831e24250fddbb (INTEGRATION: CWS xmlsec08 (1.4.24); FILE MERGED 2005/02/22 13:07:19 mt 1.4.24.1: #i36682# Accept separate Stream for signatures..., 2005-03-10), but it seems nobody called them. This also means that DocumentSignatureMode is now never set to DocumentSignatureMode::Package, so remove that as well. It seems to be unlikely that this non-published service was used by 3rd-party code, since it was specific to the needs of sfx2/ code, not generic functionality that could be useful in other contexts. Change-Id: Icfed9a0e6568f6eb21f9236901af01f1915bf2f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173313 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- .../source/component/documentdigitalsignatures.cxx | 77 ---------------------- 1 file changed, 77 deletions(-) (limited to 'xmlsecurity/source/component') diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 9c89b293bb39..07512080cf9e 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -121,9 +121,6 @@ public: css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XDocumentDigitalSignatures - sal_Bool SAL_CALL - signDocumentContent(const css::uno::Reference& xStorage, - const css::uno::Reference& xSignStream) override; sal_Bool SAL_CALL signSignatureLine( const css::uno::Reference& Storage, const css::uno::Reference& xSignStream, const OUString& aSignatureLineId, @@ -139,9 +136,6 @@ public: const css::uno::Reference& xStorage, const css::uno::Reference& xSignInStream) override; OUString SAL_CALL getDocumentContentSignatureDefaultStreamName() override; - sal_Bool SAL_CALL - signScriptingContent(const css::uno::Reference& xStorage, - const css::uno::Reference& xSignStream) override; css::uno::Sequence SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference& xStorage, @@ -150,17 +144,6 @@ public: const css::uno::Reference& xStorage, const css::uno::Reference& xSignInStream) override; OUString SAL_CALL getScriptingContentSignatureDefaultStreamName() override; - sal_Bool SAL_CALL - signPackage(const css::uno::Reference& Storage, - const css::uno::Reference& xSignStream) override; - css::uno::Sequence - SAL_CALL verifyPackageSignatures( - const css::uno::Reference& Storage, - const css::uno::Reference& xSignInStream) override; - void SAL_CALL - showPackageSignatures(const css::uno::Reference& xStorage, - const css::uno::Reference& xSignInStream) override; - OUString SAL_CALL getPackageSignatureDefaultStreamName() override; void SAL_CALL showCertificate(const css::uno::Reference& Certificate) override; void SAL_CALL manageTrustedSources() override; @@ -190,11 +173,6 @@ public: css::uno::Reference const & xStoragexStorage, css::uno::Reference const & xStream) override; - sal_Bool SAL_CALL signPackageWithCertificate( - css::uno::Reference const& xCertificate, - css::uno::Reference const& xStoragexStorage, - css::uno::Reference const& xStream) override; - sal_Bool SAL_CALL trustUntrustedCertificate( css::uno::Reference const& xCertificate) override; @@ -286,13 +264,6 @@ DocumentDigitalSignatures::getSupportedServiceNames() return aRet; } -sal_Bool DocumentDigitalSignatures::signDocumentContent( - const Reference< css::embed::XStorage >& /*rxStorage*/, - const Reference< css::io::XStream >& /*xSignStream*/) -{ - for (;;) { std::abort(); } // avoid "must return a value" warnings -} - sal_Bool DocumentDigitalSignatures::signSignatureLine( const Reference& rxStorage, const Reference& xSignStream, @@ -363,13 +334,6 @@ OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName return DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName(); } -sal_Bool DocumentDigitalSignatures::signScriptingContent( - const Reference< css::embed::XStorage >& /*rxStorage*/, - const Reference< css::io::XStream >& /*xSignStream*/ ) -{ - for (;;) { std::abort(); } // avoid "must return a value" warnings -} - Sequence< css::security::DocumentSignatureInformation > DocumentDigitalSignatures::verifyScriptingContentSignatures( const Reference< css::embed::XStorage >& rxStorage, @@ -392,37 +356,6 @@ OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamNam return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName(); } - -sal_Bool DocumentDigitalSignatures::signPackage( - const Reference< css::embed::XStorage >& /*rxStorage*/, - const Reference< css::io::XStream >& /*xSignStream*/ ) -{ - for (;;) { std::abort(); } // avoid "must return a value" warnings -} - -Sequence< css::security::DocumentSignatureInformation > -DocumentDigitalSignatures::verifyPackageSignatures( - const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) -{ - OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package ); -} - -void DocumentDigitalSignatures::showPackageSignatures( - const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) -{ - OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); - ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package, true ); -} - -OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) -{ - return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName(); -} - - void DocumentDigitalSignatures::ImplViewSignatures( const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XInputStream >& xSignStream, @@ -861,16 +794,6 @@ void DocumentDigitalSignatures::SetSignScriptingContent( mxScriptingSignStream = xScriptingSignStream; } -sal_Bool DocumentDigitalSignatures::signPackageWithCertificate( - css::uno::Reference const& xCertificate, - css::uno::Reference const& xStorage, - css::uno::Reference const& xStream) -{ - uno::Reference xModel; - return signWithCertificateImpl(xModel, xCertificate, xStorage, xStream, - DocumentSignatureMode::Package); -} - sal_Bool DocumentDigitalSignatures::trustUntrustedCertificate( css::uno::Reference const& xCertificate) { -- cgit