aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/kdf
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-27 15:48:00 -0500
committerJack Lloyd <[email protected]>2017-09-19 22:30:41 -0400
commit12c4dfec24e999ab80ff3a45e0b837976d4c390c (patch)
tree7de91a2b86aec055800b8e046729fcc10a31d6d8 /src/lib/kdf
parent0c6c4e058109791a9f17971ca782dc10af3eb9bc (diff)
Add API stability annotations.
Defined in build.h, all equal to BOTAN_DLL so ties into existing system for exporting symbols.
Diffstat (limited to 'src/lib/kdf')
-rw-r--r--src/lib/kdf/hkdf/hkdf.h6
-rw-r--r--src/lib/kdf/kdf.h4
-rw-r--r--src/lib/kdf/kdf1/kdf1.h2
-rw-r--r--src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h2
-rw-r--r--src/lib/kdf/kdf2/kdf2.h2
-rw-r--r--src/lib/kdf/prf_tls/prf_tls.h4
-rw-r--r--src/lib/kdf/prf_x942/prf_x942.h2
-rw-r--r--src/lib/kdf/sp800_108/sp800_108.h6
-rw-r--r--src/lib/kdf/sp800_56c/sp800_56c.h2
9 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/kdf/hkdf/hkdf.h b/src/lib/kdf/hkdf/hkdf.h
index 7a07f94e1..3e0f1d77c 100644
--- a/src/lib/kdf/hkdf/hkdf.h
+++ b/src/lib/kdf/hkdf/hkdf.h
@@ -18,7 +18,7 @@ namespace Botan {
/**
* HKDF from RFC 5869.
*/
-class BOTAN_DLL HKDF final : public KDF
+class BOTAN_PUBLIC_API(2,0) HKDF final : public KDF
{
public:
/**
@@ -42,7 +42,7 @@ class BOTAN_DLL HKDF final : public KDF
/**
* HKDF Extraction Step from RFC 5869.
*/
-class BOTAN_DLL HKDF_Extract final : public KDF
+class BOTAN_PUBLIC_API(2,0) HKDF_Extract final : public KDF
{
public:
/**
@@ -66,7 +66,7 @@ class BOTAN_DLL HKDF_Extract final : public KDF
/**
* HKDF Expansion Step from RFC 5869.
*/
-class BOTAN_DLL HKDF_Expand final : public KDF
+class BOTAN_PUBLIC_API(2,0) HKDF_Expand final : public KDF
{
public:
/**
diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h
index 3be026222..cc8ebf252 100644
--- a/src/lib/kdf/kdf.h
+++ b/src/lib/kdf/kdf.h
@@ -17,7 +17,7 @@ namespace Botan {
/**
* Key Derivation Function
*/
-class BOTAN_DLL KDF
+class BOTAN_PUBLIC_API(2,0) KDF
{
public:
virtual ~KDF() = default;
@@ -189,7 +189,7 @@ class BOTAN_DLL KDF
* @param algo_spec the name of the KDF to create
* @return pointer to newly allocated object of that type
*/
-BOTAN_DLL KDF* get_kdf(const std::string& algo_spec);
+BOTAN_PUBLIC_API(2,0) KDF* get_kdf(const std::string& algo_spec);
}
diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h
index 2dc9dbb33..7f895fed2 100644
--- a/src/lib/kdf/kdf1/kdf1.h
+++ b/src/lib/kdf/kdf1/kdf1.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* KDF1, from IEEE 1363
*/
-class BOTAN_DLL KDF1 final : public KDF
+class BOTAN_PUBLIC_API(2,0) KDF1 final : public KDF
{
public:
std::string name() const override { return "KDF1(" + m_hash->name() + ")"; }
diff --git a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
index d77399aa4..ce9f487ee 100644
--- a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
+++ b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* KDF1, from ISO 18033-2
*/
-class BOTAN_DLL KDF1_18033 : public KDF
+class BOTAN_PUBLIC_API(2,0) KDF1_18033 : public KDF
{
public:
std::string name() const override { return "KDF1-18033(" + m_hash->name() + ")"; }
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index 5683aeb8a..3f1f74ea6 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* KDF2, from IEEE 1363
*/
-class BOTAN_DLL KDF2 final : public KDF
+class BOTAN_PUBLIC_API(2,0) KDF2 final : public KDF
{
public:
std::string name() const override { return "KDF2(" + m_hash->name() + ")"; }
diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h
index 3f1585913..2414c305f 100644
--- a/src/lib/kdf/prf_tls/prf_tls.h
+++ b/src/lib/kdf/prf_tls/prf_tls.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* PRF used in TLS 1.0/1.1
*/
-class BOTAN_DLL TLS_PRF final : public KDF
+class BOTAN_PUBLIC_API(2,0) TLS_PRF final : public KDF
{
public:
std::string name() const override { return "TLS-PRF"; }
@@ -37,7 +37,7 @@ class BOTAN_DLL TLS_PRF final : public KDF
/**
* PRF used in TLS 1.2
*/
-class BOTAN_DLL TLS_12_PRF final : public KDF
+class BOTAN_PUBLIC_API(2,0) TLS_12_PRF final : public KDF
{
public:
std::string name() const override { return "TLS-12-PRF(" + m_mac->name() + ")"; }
diff --git a/src/lib/kdf/prf_x942/prf_x942.h b/src/lib/kdf/prf_x942/prf_x942.h
index fbc931637..01b90060b 100644
--- a/src/lib/kdf/prf_x942/prf_x942.h
+++ b/src/lib/kdf/prf_x942/prf_x942.h
@@ -15,7 +15,7 @@ namespace Botan {
/**
* PRF from ANSI X9.42
*/
-class BOTAN_DLL X942_PRF final : public KDF
+class BOTAN_PUBLIC_API(2,0) X942_PRF final : public KDF
{
public:
std::string name() const override { return "X9.42-PRF(" + m_key_wrap_oid + ")"; }
diff --git a/src/lib/kdf/sp800_108/sp800_108.h b/src/lib/kdf/sp800_108/sp800_108.h
index 848b9e2a2..1cf13721f 100644
--- a/src/lib/kdf/sp800_108/sp800_108.h
+++ b/src/lib/kdf/sp800_108/sp800_108.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* NIST SP 800-108 KDF in Counter Mode (5.1)
*/
-class BOTAN_DLL SP800_108_Counter : public KDF
+class BOTAN_PUBLIC_API(2,0) SP800_108_Counter : public KDF
{
public:
std::string name() const override { return "SP800-108-Counter(" + m_prf->name() + ")"; }
@@ -56,7 +56,7 @@ class BOTAN_DLL SP800_108_Counter : public KDF
/**
* NIST SP 800-108 KDF in Feedback Mode (5.2)
*/
-class BOTAN_DLL SP800_108_Feedback : public KDF
+class BOTAN_PUBLIC_API(2,0) SP800_108_Feedback : public KDF
{
public:
std::string name() const override { return "SP800-108-Feedback(" + m_prf->name() + ")"; }
@@ -93,7 +93,7 @@ class BOTAN_DLL SP800_108_Feedback : public KDF
/**
* NIST SP 800-108 KDF in Double Pipeline Mode (5.3)
*/
-class BOTAN_DLL SP800_108_Pipeline : public KDF
+class BOTAN_PUBLIC_API(2,0) SP800_108_Pipeline : public KDF
{
public:
std::string name() const override { return "SP800-108-Pipeline(" + m_prf->name() + ")"; }
diff --git a/src/lib/kdf/sp800_56c/sp800_56c.h b/src/lib/kdf/sp800_56c/sp800_56c.h
index aa3087974..a04593f8f 100644
--- a/src/lib/kdf/sp800_56c/sp800_56c.h
+++ b/src/lib/kdf/sp800_56c/sp800_56c.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* NIST SP 800-56C KDF
*/
-class BOTAN_DLL SP800_56C : public KDF
+class BOTAN_PUBLIC_API(2,0) SP800_56C : public KDF
{
public:
std::string name() const override { return "SP800-56C(" + m_prf->name() + ")"; }