diff options
| author | Jack Lloyd <[email protected]> | 2016-07-04 18:45:18 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-07-04 18:45:18 -0400 |
| commit | fa50960de1707c8cba0d45554ae0938ccf7e3c15 (patch) | |
| tree | 9f2edd918572462372e8221f6797723c263f7dce /src/tests | |
| parent | 203b22d2dd59f49a2639dbd06d3db7f6ca6c75d2 (diff) | |
| parent | 02fbb280da57ae714574de86601d17528aef0194 (diff) | |
Merge GH #507 Add PKCS #11 support. Previous merge 360a3a5 missed later commits
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/test_pkcs11.cpp | 5 | ||||
| -rw-r--r-- | src/tests/test_pkcs11_high_level.cpp | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/tests/test_pkcs11.cpp b/src/tests/test_pkcs11.cpp index 676e3f21a..85110cabf 100644 --- a/src/tests/test_pkcs11.cpp +++ b/src/tests/test_pkcs11.cpp @@ -7,6 +7,9 @@ #include "test_pkcs11.h" namespace Botan_Tests { + +#if defined(BOTAN_HAS_PKCS11) + using namespace Botan; using namespace PKCS11; @@ -39,4 +42,6 @@ std::vector<Test::Result> PKCS11_Test::run_pkcs11_tests(const std::string& name, return results; } +#endif + } diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp index f68203496..3be2b7268 100644 --- a/src/tests/test_pkcs11_high_level.cpp +++ b/src/tests/test_pkcs11_high_level.cpp @@ -26,15 +26,20 @@ #include <botan/p11_randomgenerator.h> #endif -#include <botan/der_enc.h> -#include <botan/pubkey.h> +#if defined(BOTAN_HAS_ASN1) + #include <botan/der_enc.h> +#endif -#if defined(BOTAN_HAS_RSA) +#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO) + #include <botan/pubkey.h> +#endif + +#if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11) #include <botan/rsa.h> #include <botan/p11_rsa.h> #endif -#if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) +#if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) && defined(BOTAN_HAS_PKCS11) #include <botan/ecc_key.h> #include <botan/ecdsa.h> #include <botan/ecdh.h> @@ -43,7 +48,7 @@ #include <botan/p11_ecdsa.h> #endif -#if defined(BOTAN_HAS_X509_CERTIFICATES) +#if defined(BOTAN_HAS_X509_CERTIFICATES) && defined(BOTAN_HAS_PKCS11) #include <botan/p11_x509.h> #endif |