ucb/source/ucp/cmis/cmis_content.cxx | 17 -----------------
ucb/source/ucp/cmis/cmis_repo_content.cxx | 17 -----------------
2 files changed, 34 deletions(-)
New commits:
commit e598cfd1d84b9eb4144e36cba0e514ea6c31f118
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Jun 21 16:02:58 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jun 24 12:36:33 2024 +0200
ucb: cmis: remove NSS initialization
Upstream curl has removed NSS backend.
Change-Id: Iaf69ceb6b71db4c9553e8d4f7b30a702d0dd0f44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169336
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 851dc790879d..c5ff2886e981 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -37,11 +37,6 @@
#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#ifndef SYSTEM_CURL
-#include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/DigestID.hpp>
-#include <com/sun/star/xml/crypto/NSSInitializer.hpp>
-#endif
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
@@ -320,18 +315,6 @@ namespace cmis
if ( nullptr == m_pSession )
{
-#ifndef SYSTEM_CURL
- // Initialize NSS library to make sure libcmis (and curl) can
access CACERTs using NSS
- // when using internal libcurl.
- uno::Reference< css::xml::crypto::XNSSInitializer >
- xNSSInitializer = css::xml::crypto::NSSInitializer::create(
m_xContext );
-
- uno::Reference< css::xml::crypto::XDigestContext > xDigestContext(
- xNSSInitializer->getDigestContext(
css::xml::crypto::DigestID::SHA256,
- uno::Sequence<
beans::NamedValue >() ),
-
uno::UNO_SET_THROW );
-#endif
-
// Set the SSL Validation handler
libcmis::CertValidationHandlerPtr certHandler(
new CertValidationHandler( xEnv, m_xContext,
aBindingUrl.GetHost( ) ) );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index af6b487f7a17..caba10826ee7 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -20,11 +20,6 @@
#include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#ifndef SYSTEM_CURL
-#include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/DigestID.hpp>
-#include <com/sun/star/xml/crypto/NSSInitializer.hpp>
-#endif
#include <config_oauth2.h>
#include <rtl/uri.hxx>
@@ -122,18 +117,6 @@ namespace cmis
void RepoContent::getRepositories( const uno::Reference<
ucb::XCommandEnvironment > & xEnv )
{
-#ifndef SYSTEM_CURL
- // Initialize NSS library to make sure libcmis (and curl) can access
CACERTs using NSS
- // when using internal libcurl.
- uno::Reference< css::xml::crypto::XNSSInitializer >
- xNSSInitializer = css::xml::crypto::NSSInitializer::create(
m_xContext );
-
- uno::Reference< css::xml::crypto::XDigestContext > xDigestContext(
- xNSSInitializer->getDigestContext(
css::xml::crypto::DigestID::SHA256,
- uno::Sequence<
beans::NamedValue >() ),
- uno::UNO_SET_THROW );
-#endif
-
// Set the proxy if needed. We are doing that all times as the proxy
data shouldn't be cached.
ucbhelper::InternetProxyDecider aProxyDecider( m_xContext );
INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) );
