aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-06-11 15:02:57 +0000
committerlloyd <[email protected]>2008-06-11 15:02:57 +0000
commit1164b265ebecfb2132b07c9492e71881c69b2be4 (patch)
tree5c803828b795484c525dcf3e2af22b0a3937b66e /src
parent0f1559b06cb7600c55672d41beeb71083d2cc879 (diff)
Some functions in engine.cpp required BOTAN_DLL macros to compile correctly.
I didn't understand why but had let it slip, but now that it's clear that their declarations were not in scope at the point of their definitions (seen via GCC's -Wmissing-declarations) it is quite obvious: the compiler had no idea the functions should be compiled with an alternative ELF scoping. Since the declarations are now included, remove the BOTAN_DLL macros from the .cpp file.
Diffstat (limited to 'src')
-rw-r--r--src/engine.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index d2cc66138..0a4bb48ee 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -225,7 +225,7 @@ const BlockCipherModePaddingMethod* retrieve_bc_pad(const std::string& name)
/*************************************************
* Add a new block cipher *
*************************************************/
-BOTAN_DLL void add_algorithm(BlockCipher* algo)
+void add_algorithm(BlockCipher* algo)
{
Library_State::Engine_Iterator i(global_state());
@@ -245,7 +245,7 @@ BOTAN_DLL void add_algorithm(BlockCipher* algo)
/*************************************************
* Add a new stream cipher *
*************************************************/
-BOTAN_DLL void add_algorithm(StreamCipher* algo)
+void add_algorithm(StreamCipher* algo)
{
Library_State::Engine_Iterator i(global_state());
@@ -265,7 +265,7 @@ BOTAN_DLL void add_algorithm(StreamCipher* algo)
/*************************************************
* Add a new hash function *
*************************************************/
-BOTAN_DLL void add_algorithm(HashFunction* algo)
+void add_algorithm(HashFunction* algo)
{
Library_State::Engine_Iterator i(global_state());
@@ -285,7 +285,7 @@ BOTAN_DLL void add_algorithm(HashFunction* algo)
/*************************************************
* Add a new authentication code *
*************************************************/
-BOTAN_DLL void add_algorithm(MessageAuthenticationCode* algo)
+void add_algorithm(MessageAuthenticationCode* algo)
{
Library_State::Engine_Iterator i(global_state());
@@ -305,7 +305,7 @@ BOTAN_DLL void add_algorithm(MessageAuthenticationCode* algo)
/*************************************************
* Add a padding method to the lookup table *
*************************************************/
-BOTAN_DLL void add_algorithm(BlockCipherModePaddingMethod* algo)
+void add_algorithm(BlockCipherModePaddingMethod* algo)
{
Library_State::Engine_Iterator i(global_state());
@@ -325,8 +325,8 @@ BOTAN_DLL void add_algorithm(BlockCipherModePaddingMethod* algo)
/*************************************************
* Get a cipher object *
*************************************************/
-BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
- Cipher_Dir direction)
+Keyed_Filter* get_cipher(const std::string& algo_spec,
+ Cipher_Dir direction)
{
Library_State::Engine_Iterator i(global_state());
@@ -343,10 +343,10 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
/*************************************************
* Get a cipher object *
*************************************************/
-BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
- const SymmetricKey& key,
- const InitializationVector& iv,
- Cipher_Dir direction)
+Keyed_Filter* get_cipher(const std::string& algo_spec,
+ const SymmetricKey& key,
+ const InitializationVector& iv,
+ Cipher_Dir direction)
{
Keyed_Filter* cipher = get_cipher(algo_spec, direction);
cipher->set_key(key);
@@ -357,9 +357,9 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
/*************************************************
* Get a cipher object *
*************************************************/
-BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec,
- const SymmetricKey& key,
- Cipher_Dir direction)
+Keyed_Filter* get_cipher(const std::string& algo_spec,
+ const SymmetricKey& key,
+ Cipher_Dir direction)
{
return get_cipher(algo_spec, key, InitializationVector(), direction);
}