diff options
| author | lloyd <[email protected]> | 2010-07-09 15:06:31 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-07-09 15:06:31 +0000 |
| commit | f9162c355d3cee11be911c4cf469044b5c3c4699 (patch) | |
| tree | 710c305d8e0f965543f56dc06ce2535c842fc524 /checks/common.h | |
| parent | 14bfa0d15fc666b83a0b58a0713abba76c85dc41 (diff) | |
Rename S2K to PBKDF, because that is by far the most common name - S2K
really is only used by OpenPGP, and largely it was named S2K here
because the OpenPGP S2K was implemented years before the ones in PKCS
#5. We have a typedef of PBKDF to S2K, and an inlined get_s2k that
calls get_pbkdf for source compatability.
There doesn't seem to be any reason to have a forward for the renamed
s2k.h header - to actually use a PBKDF, you'd have to either include
lookup.h and call get_s2k / get_pbkdf, or else include an
algorithm-specific header and use it directly. In either case,
including s2k.h is neither necessary nor sufficient.
Diffstat (limited to 'checks/common.h')
| -rw-r--r-- | checks/common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/checks/common.h b/checks/common.h index b849ce721..1b1e89bbf 100644 --- a/checks/common.h +++ b/checks/common.h @@ -34,7 +34,8 @@ Botan::Filter* lookup_hash(const std::string&); Botan::Filter* lookup_mac(const std::string&, const std::string&); Botan::Filter* lookup_rng(const std::string&, const std::string&); Botan::Filter* lookup_encoder(const std::string&); -Botan::Filter* lookup_s2k(const std::string&, const std::vector<std::string>&); +Botan::Filter* lookup_pbkdf(const std::string&, + const std::vector<std::string>&); Botan::Filter* lookup_kdf(const std::string&, const std::string&, const std::string&); |