aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-09-29 21:46:48 -0400
committerJack Lloyd <[email protected]>2017-09-29 22:14:25 -0400
commit90ce789f3d4394c972fc94f971db24ed7fc85147 (patch)
treedb0788549076ee308b4f9d52583ef0628c2bbfbc /src
parent184ce9f93906241d1807f73c7ea20283fc6ff222 (diff)
Compat typedef PBKDF -> S2K
[ci skip]
Diffstat (limited to 'src')
-rw-r--r--src/lib/pbkdf/pbkdf.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/pbkdf/pbkdf.h b/src/lib/pbkdf/pbkdf.h
index 7c397da22..a1afa84c9 100644
--- a/src/lib/pbkdf/pbkdf.h
+++ b/src/lib/pbkdf/pbkdf.h
@@ -216,6 +216,11 @@ class BOTAN_PUBLIC_API(2,0) PBKDF
}
};
+/*
+* Compatability typedef
+*/
+typedef PBKDF S2K;
+
/**
* Password based key derivation function factory method
* @param algo_spec the name of the desired PBKDF algorithm
@@ -223,7 +228,7 @@ class BOTAN_PUBLIC_API(2,0) PBKDF
* @return pointer to newly allocated object of that type
*/
inline PBKDF* get_pbkdf(const std::string& algo_spec,
- const std::string& provider = "")
+ const std::string& provider = "")
{
std::unique_ptr<PBKDF> p(PBKDF::create(algo_spec, provider));
if(p)
@@ -231,6 +236,12 @@ inline PBKDF* get_pbkdf(const std::string& algo_spec,
throw Algorithm_Not_Found(algo_spec);
}
+inline PBKDF2* get_s2k(const std::string& algo_spec)
+ {
+ return get_pbkdf(algo_spec);
+ }
+
+
}
#endif