aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-09-11 17:29:16 -0400
committerJack Lloyd <[email protected]>2018-09-11 17:29:16 -0400
commit7f1ae84b36af73f98991723e1069d7c7850198ad (patch)
tree06d549f106d73950ff41130cf9afe8c7b17c9528 /src
parent1b944cc9157e28199cac4f2ef4a01ae97a2d4201 (diff)
Fix certstore tests
Accidentally disabled in 643a4041bedc
Diffstat (limited to 'src')
-rw-r--r--src/lib/x509/info.txt1
-rw-r--r--src/tests/test_certstor.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/x509/info.txt b/src/lib/x509/info.txt
index 6b136cbcf..20a1aa2b0 100644
--- a/src/lib/x509/info.txt
+++ b/src/lib/x509/info.txt
@@ -1,5 +1,6 @@
<defines>
X509_CERTIFICATES -> 20151023
+X509 -> 20180911
OCSP -> 20161118
</defines>
diff --git a/src/tests/test_certstor.cpp b/src/tests/test_certstor.cpp
index 4963f7465..5bf8ce8fa 100644
--- a/src/tests/test_certstor.cpp
+++ b/src/tests/test_certstor.cpp
@@ -7,7 +7,8 @@
#include "tests.h"
#include <sstream>
-#if defined(BOTAN_HAS_X509) && defined(BOTAN_HAS_PUBKEY)
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
+ #include <botan/x509cert.h>
#include <botan/certstor.h>
#include <botan/internal/filesystem.h>
#include <botan/pkcs8.h>
@@ -23,7 +24,7 @@ namespace Botan_Tests {
namespace {
-#if defined(BOTAN_HAS_X509) && defined(BOTAN_HAS_RSA) && defined(BOTAN_TARGET_OS_HAS_FILESYSTEM)
+#if defined(BOTAN_HAS_X509_CERTIFICATES) && defined(BOTAN_HAS_RSA) && defined(BOTAN_TARGET_OS_HAS_FILESYSTEM)
struct CertificateAndKey
{