diff options
| author | Jack Lloyd <[email protected]> | 2017-09-19 22:37:57 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-19 22:37:57 -0400 |
| commit | 520903f86ea9cf5088526ecd5bb9879f117671f2 (patch) | |
| tree | 90ca44fa2b8ed8e828d316886452e8c80d6f08ad /src/lib/pubkey/pbes2 | |
| parent | 0c6c4e058109791a9f17971ca782dc10af3eb9bc (diff) | |
| parent | da5466639c474bea919aee1aefda76ed4625fe85 (diff) | |
Merge GH #1216 Add API annotations indicating version added and API stability
Diffstat (limited to 'src/lib/pubkey/pbes2')
| -rw-r--r-- | src/lib/pubkey/pbes2/pbes2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/pubkey/pbes2/pbes2.h b/src/lib/pubkey/pbes2/pbes2.h index 951ba3178..edd46f7eb 100644 --- a/src/lib/pubkey/pbes2/pbes2.h +++ b/src/lib/pubkey/pbes2/pbes2.h @@ -24,7 +24,7 @@ namespace Botan { * @param rng a random number generator */ std::pair<AlgorithmIdentifier, std::vector<uint8_t>> -BOTAN_DLL pbes2_encrypt(const secure_vector<uint8_t>& key_bits, +BOTAN_PUBLIC_API(2,0) pbes2_encrypt(const secure_vector<uint8_t>& key_bits, const std::string& passphrase, std::chrono::milliseconds msec, const std::string& cipher, @@ -43,7 +43,7 @@ BOTAN_DLL pbes2_encrypt(const secure_vector<uint8_t>& key_bits, * @param rng a random number generator */ std::pair<AlgorithmIdentifier, std::vector<uint8_t>> -BOTAN_DLL pbes2_encrypt_msec(const secure_vector<uint8_t>& key_bits, +BOTAN_PUBLIC_API(2,1) pbes2_encrypt_msec(const secure_vector<uint8_t>& key_bits, const std::string& passphrase, std::chrono::milliseconds msec, size_t* out_iterations_if_nonnull, @@ -61,7 +61,7 @@ BOTAN_DLL pbes2_encrypt_msec(const secure_vector<uint8_t>& key_bits, * @param rng a random number generator */ std::pair<AlgorithmIdentifier, std::vector<uint8_t>> -BOTAN_DLL pbes2_encrypt_iter(const secure_vector<uint8_t>& key_bits, +BOTAN_PUBLIC_API(2,1) pbes2_encrypt_iter(const secure_vector<uint8_t>& key_bits, const std::string& passphrase, size_t iterations, const std::string& cipher, @@ -75,7 +75,7 @@ BOTAN_DLL pbes2_encrypt_iter(const secure_vector<uint8_t>& key_bits, * @param params the PBES2 parameters */ secure_vector<uint8_t> -BOTAN_DLL pbes2_decrypt(const secure_vector<uint8_t>& key_bits, +BOTAN_PUBLIC_API(2,0) pbes2_decrypt(const secure_vector<uint8_t>& key_bits, const std::string& passphrase, const std::vector<uint8_t>& params); |