Move the KDF base class code into kdf.cpp; this prevents the pk_util.cpp

object code from being linked in when a user just wants to use a PRF

2 files changed, 54 insertions, 54 deletions

diff --git a/src/kdf.cpp b/src/kdf.cpp
index c9a86796f..3dfef5dcf 100644
--- a/src/kdf.cpp
+++ b/src/kdf.cpp
@@ -12,6 +12,60 @@
 namespace Botan {
 
 /*************************************************
+* Derive a key                                   *
+*************************************************/
+SecureVector<byte> KDF::derive_key(u32bit key_len,
+                                   const MemoryRegion<byte>& secret,
+                                   const std::string& salt) const
+   {
+   return derive_key(key_len, secret, secret.size(),
+                     (const byte*)salt.c_str(), salt.length());
+   }
+
+/*************************************************
+* Derive a key                                   *
+*************************************************/
+SecureVector<byte> KDF::derive_key(u32bit key_len,
+                                   const MemoryRegion<byte>& secret,
+                                   const byte salt[], u32bit salt_len) const
+   {
+   return derive_key(key_len, secret.begin(), secret.size(),
+                     salt, salt_len);
+   }
+
+/*************************************************
+* Derive a key                                   *
+*************************************************/
+SecureVector<byte> KDF::derive_key(u32bit key_len,
+                                   const MemoryRegion<byte>& secret,
+                                   const MemoryRegion<byte>& salt) const
+   {
+   return derive_key(key_len, secret.begin(), secret.size(),
+                     salt.begin(), salt.size());
+   }
+
+/*************************************************
+* Derive a key                                   *
+*************************************************/
+SecureVector<byte> KDF::derive_key(u32bit key_len,
+                                   const byte secret[], u32bit secret_len,
+                                   const std::string& salt) const
+   {
+   return derive_key(key_len, secret, secret_len,
+                     (const byte*)salt.c_str(), salt.length());
+   }
+
+/*************************************************
+* Derive a key                                   *
+*************************************************/
+SecureVector<byte> KDF::derive_key(u32bit key_len,
+                                   const byte secret[], u32bit secret_len,
+                                   const byte salt[], u32bit salt_len) const
+   {
+   return derive(key_len, secret, secret_len, salt, salt_len);
+   }
+
+/*************************************************
 * KDF1 Key Derivation Mechanism                  *
 *************************************************/
 SecureVector<byte> KDF1::derive(u32bit,
diff --git a/src/pk_util.cpp b/src/pk_util.cpp
index 04b952bd8..79ceeb00d 100644
--- a/src/pk_util.cpp
+++ b/src/pk_util.cpp
@@ -59,58 +59,4 @@ bool EMSA::verify(const MemoryRegion<byte>& coded,
       }
    }
 
-/*************************************************
-* Derive a key                                   *
-*************************************************/
-SecureVector<byte> KDF::derive_key(u32bit key_len,
-                                   const MemoryRegion<byte>& secret,
-                                   const std::string& salt) const
-   {
-   return derive_key(key_len, secret, secret.size(),
-                     (const byte*)salt.c_str(), salt.length());
-   }
-
-/*************************************************
-* Derive a key                                   *
-*************************************************/
-SecureVector<byte> KDF::derive_key(u32bit key_len,
-                                   const MemoryRegion<byte>& secret,
-                                   const byte salt[], u32bit salt_len) const
-   {
-   return derive_key(key_len, secret.begin(), secret.size(),
-                     salt, salt_len);
-   }
-
-/*************************************************
-* Derive a key                                   *
-*************************************************/
-SecureVector<byte> KDF::derive_key(u32bit key_len,
-                                   const MemoryRegion<byte>& secret,
-                                   const MemoryRegion<byte>& salt) const
-   {
-   return derive_key(key_len, secret.begin(), secret.size(),
-                     salt.begin(), salt.size());
-   }
-
-/*************************************************
-* Derive a key                                   *
-*************************************************/
-SecureVector<byte> KDF::derive_key(u32bit key_len,
-                                   const byte secret[], u32bit secret_len,
-                                   const std::string& salt) const
-   {
-   return derive_key(key_len, secret, secret_len,
-                     (const byte*)salt.c_str(), salt.length());
-   }
-
-/*************************************************
-* Derive a key                                   *
-*************************************************/
-SecureVector<byte> KDF::derive_key(u32bit key_len,
-                                   const byte secret[], u32bit secret_len,
-                                   const byte salt[], u32bit salt_len) const
-   {
-   return derive(key_len, secret, secret_len, salt, salt_len);
-   }
-
 }