From 07556be594c77f9b7886ff31c2e1752f937cacd4 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 28 May 2021 13:52:37 +0200 Subject: Select svl crypto backend in configure.ac And define USE_CRYPTO_* macros to select it in code. This way we can get rid of all the HAVE_FEATURE_NSS and _WIN32 variations. This also reverts 1f6b98f21495f0ecc5ded493cb3273da03852191. Change-Id: I101e4ae2f49cdb127d59bd49a4f1c86304ca2238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116338 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- config_host/config_crypto.h.in | 36 ++++++++++++++++++++++++++++++++++++ config_host/config_features.h.in | 5 ----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 config_host/config_crypto.h.in (limited to 'config_host') diff --git a/config_host/config_crypto.h.in b/config_host/config_crypto.h.in new file mode 100644 index 000000000000..106485d55213 --- /dev/null +++ b/config_host/config_crypto.h.in @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef CONFIG_CRYPTO_H +#define CONFIG_CRYPTO_H + +/* + * Whether NSS is available + */ +#define HAVE_FEATURE_NSS 0 + +/* + * Use MS CAPI for crypto operations + */ +#define USE_CRYPTO_MSCAPI 0 + +/* + * Use Mozilla for crypto operations + */ +#define USE_CRYPTO_NSS 0 + +#if USE_CRYPTO_MSCAPI || USE_CRYPTO_NSS +#define USE_CRYPTO_ANY 1 +#else +#define USE_CRYPTO_ANY 0 +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index a4ecdd76af8b..c557a405ceb1 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -126,11 +126,6 @@ */ #define HAVE_FEATURE_PDFIMPORT 0 -/* - * Whether NSS is available - */ -#define HAVE_FEATURE_NSS 0 - /* * Whether poppler is available */ -- cgit v1.2.3