diff options
| author | lloyd <[email protected]> | 2009-12-16 22:53:25 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 22:53:25 +0000 |
| commit | f3f36611db8c3f6c67c818d454973a0165b0fcf2 (patch) | |
| tree | 1fc131e32869e00eb7c87e70bee53fe26bc276b3 /src/libstate | |
| parent | e65ec3c8aae63d8c1942ce786d3b8c1f68a81e91 (diff) | |
Add missing BOTAN_DLL exports.
Move most of the engine headers to internal
Diffstat (limited to 'src/libstate')
| -rw-r--r-- | src/libstate/info.txt | 5 | ||||
| -rw-r--r-- | src/libstate/libstate.cpp | 17 | ||||
| -rw-r--r-- | src/libstate/pk_engine.cpp | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/libstate/info.txt b/src/libstate/info.txt index 605a5a6a0..d8e9869ac 100644 --- a/src/libstate/info.txt +++ b/src/libstate/info.txt @@ -8,10 +8,13 @@ libstate.h init.h look_pk.h lookup.h -pk_engine.h scan_name.h </header:public> +<header:internal> +pk_engine.h +</header:internal> + <source> get_enc.cpp init.cpp diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp index 2de621648..6aa3c5119 100644 --- a/src/libstate/libstate.cpp +++ b/src/libstate/libstate.cpp @@ -7,12 +7,13 @@ #include <botan/libstate.h> #include <botan/charset.h> -#include <botan/def_eng.h> #include <botan/engine.h> #include <botan/init.h> -#include <botan/internal/mutex.h> #include <botan/selftest.h> + #include <botan/internal/defalloc.h> +#include <botan/internal/default_engine.h> +#include <botan/internal/mutex.h> #include <botan/internal/mux_noop.h> #include <botan/internal/stl_util.h> #include <algorithm> @@ -30,27 +31,27 @@ #endif #if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER) - #include <botan/eng_ia32.h> + #include <botan/internal/ia32_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_AMD64_ASSEMBLER) - #include <botan/eng_amd64.h> + #include <botan/internal/amd64_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_AES_ISA) - #include <botan/aes_isa_engine.h> + #include <botan/internal/aes_isa_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_SIMD) - #include <botan/simd_engine.h> + #include <botan/internal/simd_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_GNU_MP) - #include <botan/eng_gmp.h> + #include <botan/internal/gnump_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_OPENSSL) - #include <botan/eng_ossl.h> + #include <botan/internal/openssl_engine.h> #endif namespace Botan { diff --git a/src/libstate/pk_engine.cpp b/src/libstate/pk_engine.cpp index 790ddcde4..d6f4f7015 100644 --- a/src/libstate/pk_engine.cpp +++ b/src/libstate/pk_engine.cpp @@ -5,7 +5,7 @@ * Distributed under the terms of the Botan license */ -#include <botan/pk_engine.h> +#include <botan/internal/pk_engine.h> #include <botan/libstate.h> #include <botan/engine.h> |