diff options
| author | Jack Lloyd <[email protected]> | 2016-12-04 15:41:18 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-12-04 15:41:18 -0500 |
| commit | a681421d01ea132ea3461f99641daacd9bd64df9 (patch) | |
| tree | 74db1814275bc3f556fab326ffea9c84dfdbf92c /src/lib/prov | |
| parent | 786e3100649d913ab0bbf223c53624c4beb38e35 (diff) | |
Expose pk_ops.h as public interface again
I was initially thinking of Botan as somewhat closed system, but
@cordney has a legit use case of wanting to expose a TPM sign
operation, but using their internal TPM library and TPM key type.
This requires the API be exposed so the derivation can occur.
Add a comment in the header explaining that the header is not for
normal application use and directing them to pubkey.h
This basically reverts 2747e8e23aec43162
Diffstat (limited to 'src/lib/prov')
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecdh.cpp | 2 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_ecdsa.cpp | 2 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11_rsa.cpp | 3 | ||||
| -rw-r--r-- | src/lib/prov/tpm/tpm.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/prov/pkcs11/p11_ecdh.cpp b/src/lib/prov/pkcs11/p11_ecdh.cpp index 474d1dac0..f2604185d 100644 --- a/src/lib/prov/pkcs11/p11_ecdh.cpp +++ b/src/lib/prov/pkcs11/p11_ecdh.cpp @@ -13,7 +13,7 @@ #include <botan/internal/p11_mechanism.h> #include <botan/ber_dec.h> #include <botan/der_enc.h> -#include <botan/internal/pk_ops.h> +#include <botan/pk_ops.h> #include <botan/rng.h> namespace Botan { diff --git a/src/lib/prov/pkcs11/p11_ecdsa.cpp b/src/lib/prov/pkcs11/p11_ecdsa.cpp index c2ba02e0f..852366d25 100644 --- a/src/lib/prov/pkcs11/p11_ecdsa.cpp +++ b/src/lib/prov/pkcs11/p11_ecdsa.cpp @@ -11,7 +11,7 @@ #if defined(BOTAN_HAS_ECDSA) #include <botan/internal/p11_mechanism.h> -#include <botan/internal/pk_ops.h> +#include <botan/pk_ops.h> #include <botan/keypair.h> #include <botan/rng.h> diff --git a/src/lib/prov/pkcs11/p11_rsa.cpp b/src/lib/prov/pkcs11/p11_rsa.cpp index 0312f76bf..ea0fc874b 100644 --- a/src/lib/prov/pkcs11/p11_rsa.cpp +++ b/src/lib/prov/pkcs11/p11_rsa.cpp @@ -11,8 +11,7 @@ #if defined(BOTAN_HAS_RSA) #include <botan/internal/p11_mechanism.h> -#include <botan/internal/pk_ops.h> -#include <botan/internal/pk_ops.h> +#include <botan/pk_ops.h> #include <botan/rng.h> #include <botan/blinding.h> diff --git a/src/lib/prov/tpm/tpm.cpp b/src/lib/prov/tpm/tpm.cpp index cb5a242eb..0c2f9353e 100644 --- a/src/lib/prov/tpm/tpm.cpp +++ b/src/lib/prov/tpm/tpm.cpp @@ -11,7 +11,7 @@ #include <botan/hash_id.h> #include <botan/der_enc.h> #include <botan/workfactor.h> -#include <botan/internal/pk_ops.h> +#include <botan/pk_ops.h> #include <sstream> #include <tss/platform.h> |