diff options
| author | Jack Lloyd <[email protected]> | 2016-08-23 12:13:22 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-23 12:13:22 -0400 |
| commit | 3c39fd81b905db2532c6e63b3f5f13be706ca7c1 (patch) | |
| tree | ef331211052dc4d7a595bcfc18c4ddfb92f3764b /src/lib | |
| parent | 10eb64e54d18e83c3c0c0697314465daa106c8ae (diff) | |
Work around some amalgamation issues.
I think probably what these headers had should work, but end up
confusing the generator and breaking the build:
https://travis-ci.org/randombit/botan/jobs/154197472
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecc_key.h | 5 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_rsa.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h index a32a78339..ac0667f89 100644 --- a/src/lib/prov/pkcs11/p11_ecc_key.h +++ b/src/lib/prov/pkcs11/p11_ecc_key.h @@ -10,15 +10,14 @@ #define BOTAN_P11_ECC_H__ #include <botan/build.h> -#if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) - #include <botan/p11_object.h> #include <botan/pk_keys.h> + +#if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) #include <botan/ecc_key.h> #include <botan/ec_group.h> #include <botan/rng.h> #include <botan/alg_id.h> - #include <vector> namespace Botan { diff --git a/src/lib/prov/pkcs11/p11_rsa.h b/src/lib/prov/pkcs11/p11_rsa.h index bf1422dc2..2739cf3e5 100644 --- a/src/lib/prov/pkcs11/p11_rsa.h +++ b/src/lib/prov/pkcs11/p11_rsa.h @@ -10,13 +10,12 @@ #define BOTAN_P11_RSA_H__ #include <botan/build.h> -#if defined(BOTAN_HAS_RSA) - #include <botan/p11.h> #include <botan/p11_session.h> #include <botan/p11_object.h> -#include <botan/rsa.h> +#if defined(BOTAN_HAS_RSA) +#include <botan/rsa.h> #include <utility> namespace Botan { |