diff options
| author | Jack Lloyd <[email protected]> | 2018-02-07 10:53:02 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-02-07 10:53:02 -0500 |
| commit | d4ef204878ed7c675c16531a482cd373b8fa8b0b (patch) | |
| tree | 08646135b902f06fbe5085e4bfa625ea3c534c55 /src/lib/prov | |
| parent | 0d63e98483e304a385013a4568312ab94dff3822 (diff) | |
Fix compliation problem in PKCS11
./configure.py --amal --mini --enable-modules=pkcs11
would fail to build because the guarded includes of pk_keys.h
ended up hiding the declaration entirely. This is really a bug in
how the amalgamation is generated but may be hard to fix in the
general case.
Diffstat (limited to 'src/lib/prov')
| -rw-r--r-- | src/lib/prov/pkcs11/info.txt | 1 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecc_key.cpp | 1 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecc_key.h | 2 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecdsa.h | 1 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_rsa.cpp | 1 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_rsa.h | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt index b47fc6b29..730fd9ef6 100644 --- a/src/lib/prov/pkcs11/info.txt +++ b/src/lib/prov/pkcs11/info.txt @@ -5,6 +5,7 @@ PKCS11 -> 20160219 <requires> dyn_load rng +pubkey pk_pad </requires> diff --git a/src/lib/prov/pkcs11/p11_ecc_key.cpp b/src/lib/prov/pkcs11/p11_ecc_key.cpp index 3a0fa6350..d5a9a2b76 100644 --- a/src/lib/prov/pkcs11/p11_ecc_key.cpp +++ b/src/lib/prov/pkcs11/p11_ecc_key.cpp @@ -7,6 +7,7 @@ */ #include <botan/p11_ecc_key.h> +#include <botan/pk_keys.h> #if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h index 2372ae07c..5522b07ca 100644 --- a/src/lib/prov/pkcs11/p11_ecc_key.h +++ b/src/lib/prov/pkcs11/p11_ecc_key.h @@ -10,9 +10,9 @@ #define BOTAN_P11_ECC_H_ #include <botan/p11_object.h> +#include <botan/pk_keys.h> #if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO) -#include <botan/pk_keys.h> #include <botan/ecc_key.h> #include <botan/ec_group.h> #include <botan/alg_id.h> diff --git a/src/lib/prov/pkcs11/p11_ecdsa.h b/src/lib/prov/pkcs11/p11_ecdsa.h index ae1a9c0bc..0843c85ba 100644 --- a/src/lib/prov/pkcs11/p11_ecdsa.h +++ b/src/lib/prov/pkcs11/p11_ecdsa.h @@ -10,6 +10,7 @@ #define BOTAN_P11_ECDSA_H_ #include <botan/p11.h> +#include <botan/pk_keys.h> #if defined(BOTAN_HAS_ECDSA) diff --git a/src/lib/prov/pkcs11/p11_rsa.cpp b/src/lib/prov/pkcs11/p11_rsa.cpp index 4962982b0..e62c038ec 100644 --- a/src/lib/prov/pkcs11/p11_rsa.cpp +++ b/src/lib/prov/pkcs11/p11_rsa.cpp @@ -7,6 +7,7 @@ */ #include <botan/p11_rsa.h> +#include <botan/pk_keys.h> #if defined(BOTAN_HAS_RSA) diff --git a/src/lib/prov/pkcs11/p11_rsa.h b/src/lib/prov/pkcs11/p11_rsa.h index a4f3a04d7..7531a00cc 100644 --- a/src/lib/prov/pkcs11/p11_rsa.h +++ b/src/lib/prov/pkcs11/p11_rsa.h @@ -11,6 +11,7 @@ #include <botan/p11_session.h> #include <botan/p11_object.h> +#include <botan/pk_keys.h> #if defined(BOTAN_HAS_RSA) #include <botan/rsa.h> |