diff options
| author | Jack Lloyd <[email protected]> | 2018-09-07 14:19:32 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-09-07 14:19:32 -0400 |
| commit | cc9e507e02be4abd732c2535c37c9c761b33b488 (patch) | |
| tree | b713c7ecef923e546095d09bb73f01e02d3e8963 | |
| parent | ca6d04898f43d7bb707f5ee5135d83096b6611b7 (diff) | |
| parent | 67062441f6bac3785b755eacd8d67e1a2a69f085 (diff) | |
Merge GH #1675 Test certstore even if sqlite is disabled
| -rw-r--r-- | src/tests/test_certstor.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/tests/test_certstor.cpp b/src/tests/test_certstor.cpp index 26c1b26d1..0508189cb 100644 --- a/src/tests/test_certstor.cpp +++ b/src/tests/test_certstor.cpp @@ -6,23 +6,21 @@ #include "tests.h" -#if defined(BOTAN_HAS_CERTSTOR_SQL) - #include <botan/certstor.h> - #include <botan/internal/filesystem.h> - #include <botan/pkcs8.h> - #include <botan/pk_keys.h> - #include <sstream> - #if defined(BOTAN_HAS_CERTSTOR_SQLITE3) - #include <botan/certstor_sqlite.h> - #include <botan/sqlite3.h> - #endif +#include <botan/certstor.h> +#include <botan/internal/filesystem.h> +#include <botan/pkcs8.h> +#include <botan/pk_keys.h> +#include <sstream> +#if defined(BOTAN_HAS_CERTSTOR_SQLITE3) + #include <botan/certstor_sqlite.h> + #include <botan/sqlite3.h> #endif namespace Botan_Tests { namespace { -#if defined(BOTAN_HAS_CERTSTOR_SQL) && defined(BOTAN_HAS_RSA) && defined(BOTAN_TARGET_OS_HAS_FILESYSTEM) +#if defined(BOTAN_HAS_RSA) && defined(BOTAN_TARGET_OS_HAS_FILESYSTEM) struct CertificateAndKey { |