aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/misc')
-rw-r--r--src/lib/misc/aont/package.h16
-rw-r--r--src/lib/misc/cryptobox/cryptobox.h6
-rw-r--r--src/lib/misc/fpe_fe1/fpe_fe1.h4
-rw-r--r--src/lib/misc/rfc3394/rfc3394.h4
-rw-r--r--src/lib/misc/srp6/srp6.h8
-rw-r--r--src/lib/misc/tss/tss.h2
6 files changed, 21 insertions, 19 deletions
diff --git a/src/lib/misc/aont/package.h b/src/lib/misc/aont/package.h
index 8b2ed1b1f..f48a757bf 100644
--- a/src/lib/misc/aont/package.h
+++ b/src/lib/misc/aont/package.h
@@ -23,10 +23,11 @@ namespace Botan {
* input_len + cipher->BLOCK_SIZE bytes long)
*/
BOTAN_DEPRECATED("Possibly broken, avoid")
-void BOTAN_DLL aont_package(RandomNumberGenerator& rng,
- BlockCipher* cipher,
- const uint8_t input[], size_t input_len,
- uint8_t output[]);
+void BOTAN_PUBLIC_API(2,0)
+aont_package(RandomNumberGenerator& rng,
+ BlockCipher* cipher,
+ const uint8_t input[], size_t input_len,
+ uint8_t output[]);
/**
* Rivest's Package Tranform (Inversion)
@@ -37,9 +38,10 @@ void BOTAN_DLL aont_package(RandomNumberGenerator& rng,
* input_len - cipher->BLOCK_SIZE bytes long)
*/
BOTAN_DEPRECATED("Possibly broken, avoid")
-void BOTAN_DLL aont_unpackage(BlockCipher* cipher,
- const uint8_t input[], size_t input_len,
- uint8_t output[]);
+void BOTAN_PUBLIC_API(2,0)
+aont_unpackage(BlockCipher* cipher,
+ const uint8_t input[], size_t input_len,
+ uint8_t output[]);
}
diff --git a/src/lib/misc/cryptobox/cryptobox.h b/src/lib/misc/cryptobox/cryptobox.h
index 8a524c93c..da58cbf21 100644
--- a/src/lib/misc/cryptobox/cryptobox.h
+++ b/src/lib/misc/cryptobox/cryptobox.h
@@ -26,7 +26,7 @@ namespace CryptoBox {
* @param passphrase the passphrase used to encrypt the message
* @param rng a ref to a random number generator, such as AutoSeeded_RNG
*/
-BOTAN_DLL std::string encrypt(const uint8_t input[], size_t input_len,
+BOTAN_PUBLIC_API(2,0) std::string encrypt(const uint8_t input[], size_t input_len,
const std::string& passphrase,
RandomNumberGenerator& rng);
@@ -37,7 +37,7 @@ BOTAN_DLL std::string encrypt(const uint8_t input[], size_t input_len,
* @param input_len the length of input in bytes
* @param passphrase the passphrase used to encrypt the message
*/
-BOTAN_DLL std::string decrypt(const uint8_t input[], size_t input_len,
+BOTAN_PUBLIC_API(2,0) std::string decrypt(const uint8_t input[], size_t input_len,
const std::string& passphrase);
/**
@@ -45,7 +45,7 @@ BOTAN_DLL std::string decrypt(const uint8_t input[], size_t input_len,
* @param input the input data
* @param passphrase the passphrase used to encrypt the message
*/
-BOTAN_DLL std::string decrypt(const std::string& input,
+BOTAN_PUBLIC_API(2,0) std::string decrypt(const std::string& input,
const std::string& passphrase);
}
diff --git a/src/lib/misc/fpe_fe1/fpe_fe1.h b/src/lib/misc/fpe_fe1/fpe_fe1.h
index fe86f0718..8d8ff6ae5 100644
--- a/src/lib/misc/fpe_fe1/fpe_fe1.h
+++ b/src/lib/misc/fpe_fe1/fpe_fe1.h
@@ -26,7 +26,7 @@ namespace FPE {
* @param key a random key
* @param tweak will modify the ciphertext (think of as an IV)
*/
-BigInt BOTAN_DLL fe1_encrypt(const BigInt& n, const BigInt& X,
+BigInt BOTAN_PUBLIC_API(2,0) fe1_encrypt(const BigInt& n, const BigInt& X,
const SymmetricKey& key,
const std::vector<uint8_t>& tweak);
@@ -37,7 +37,7 @@ BigInt BOTAN_DLL fe1_encrypt(const BigInt& n, const BigInt& X,
* @param key is the key used for encryption
* @param tweak the same tweak used for encryption
*/
-BigInt BOTAN_DLL fe1_decrypt(const BigInt& n, const BigInt& X,
+BigInt BOTAN_PUBLIC_API(2,0) fe1_decrypt(const BigInt& n, const BigInt& X,
const SymmetricKey& key,
const std::vector<uint8_t>& tweak);
diff --git a/src/lib/misc/rfc3394/rfc3394.h b/src/lib/misc/rfc3394/rfc3394.h
index 5690c4713..4b212810e 100644
--- a/src/lib/misc/rfc3394/rfc3394.h
+++ b/src/lib/misc/rfc3394/rfc3394.h
@@ -20,7 +20,7 @@ namespace Botan {
* @param kek the key encryption key
* @return key encrypted under kek
*/
-secure_vector<uint8_t> BOTAN_DLL rfc3394_keywrap(const secure_vector<uint8_t>& key,
+secure_vector<uint8_t> BOTAN_PUBLIC_API(2,0) rfc3394_keywrap(const secure_vector<uint8_t>& key,
const SymmetricKey& kek);
/**
@@ -31,7 +31,7 @@ secure_vector<uint8_t> BOTAN_DLL rfc3394_keywrap(const secure_vector<uint8_t>& k
* @param kek the key encryption key
* @return key decrypted under kek
*/
-secure_vector<uint8_t> BOTAN_DLL rfc3394_keyunwrap(const secure_vector<uint8_t>& key,
+secure_vector<uint8_t> BOTAN_PUBLIC_API(2,0) rfc3394_keyunwrap(const secure_vector<uint8_t>& key,
const SymmetricKey& kek);
}
diff --git a/src/lib/misc/srp6/srp6.h b/src/lib/misc/srp6/srp6.h
index af9f427d0..24c2693aa 100644
--- a/src/lib/misc/srp6/srp6.h
+++ b/src/lib/misc/srp6/srp6.h
@@ -29,7 +29,7 @@ namespace Botan {
* @return (A,K) the client public key and the shared secret key
*/
std::pair<BigInt,SymmetricKey>
-BOTAN_DLL srp6_client_agree(const std::string& username,
+BOTAN_PUBLIC_API(2,0) srp6_client_agree(const std::string& username,
const std::string& password,
const std::string& group_id,
const std::string& hash_id,
@@ -45,7 +45,7 @@ BOTAN_DLL srp6_client_agree(const std::string& username,
* @param group_id specifies the shared SRP group
* @param hash_id specifies a secure hash function
*/
-BigInt BOTAN_DLL generate_srp6_verifier(const std::string& identifier,
+BigInt BOTAN_PUBLIC_API(2,0) generate_srp6_verifier(const std::string& identifier,
const std::string& password,
const std::vector<uint8_t>& salt,
const std::string& group_id,
@@ -58,12 +58,12 @@ BigInt BOTAN_DLL generate_srp6_verifier(const std::string& identifier,
* @param g the group generator
* @return group identifier
*/
-std::string BOTAN_DLL srp6_group_identifier(const BigInt& N, const BigInt& g);
+std::string BOTAN_PUBLIC_API(2,0) srp6_group_identifier(const BigInt& N, const BigInt& g);
/**
* Represents a SRP-6a server session
*/
-class BOTAN_DLL SRP6_Server_Session
+class BOTAN_PUBLIC_API(2,0) SRP6_Server_Session
{
public:
/**
diff --git a/src/lib/misc/tss/tss.h b/src/lib/misc/tss/tss.h
index ac96a6e0c..354b43514 100644
--- a/src/lib/misc/tss/tss.h
+++ b/src/lib/misc/tss/tss.h
@@ -18,7 +18,7 @@ namespace Botan {
/**
* A split secret, using the format from draft-mcgrew-tss-03
*/
-class BOTAN_DLL RTSS_Share
+class BOTAN_PUBLIC_API(2,0) RTSS_Share
{
public:
/**