diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2014-07-16 17:02:01 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2014-07-17 10:39:35 +0200 |
| commit | 89361fa68af9a6854dc3a07711279f27561ea8fb (patch) | |
| tree | 2229a017e268aa372ee7b2de2e3e071646d060ed /ucb | |
| parent | a95934d8dbd91e3c6250578171483859cb11f3c2 (diff) | |
fdo#72277: don't build and use nsspem when building against system curl
System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support.
Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 5b817485e7a7..7cd9d3e7170f 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -32,10 +32,12 @@ #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/XDigestContextSupplier.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/NSSInitializer.hpp> +#endif #include <comphelper/processfactory.hxx> #include <config_oauth2.h> @@ -276,6 +278,7 @@ namespace cmis if ( NULL == 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< com::sun::star::xml::crypto::XNSSInitializer > @@ -285,6 +288,7 @@ namespace cmis xNSSInitializer->getDigestContext( com::sun::star::xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW ); +#endif // Set the SSL Validation handler libcmis::CertValidationHandlerPtr certHandler( diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 3adc2b34e0b9..4d2504978388 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -15,10 +15,12 @@ #include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> +#ifndef SYSTEM_CURL #include <com/sun/star/xml/crypto/XDigestContext.hpp> #include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/NSSInitializer.hpp> +#endif #include <comphelper/processfactory.hxx> #include <config_oauth2.h> @@ -124,6 +126,7 @@ 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< com::sun::star::xml::crypto::XNSSInitializer > @@ -133,6 +136,7 @@ namespace cmis xNSSInitializer->getDigestContext( com::sun::star::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 ); |