Modify the S2K interface. Instead of being stateful in terms of the salt

and iteration count, force it to be passed to each call to derive_key.
So remove current_salt, set_iterations, new_random_salt, and change_salt
functions from S2K interface.

Update examples and test application to match.

While I was in there, change the passhash example to use 64 bit salts
and 128 bit PBKDF2 outputs.

1 files changed, 3 insertions, 3 deletions

diff --git a/checks/dolook.cpp b/checks/dolook.cpp
index 28ac60c1b..aa2d58e1f 100644
--- a/checks/dolook.cpp
+++ b/checks/dolook.cpp
@@ -60,9 +60,9 @@ class S2K_Filter : public Filter
          { passphrase += std::string(reinterpret_cast<const char*>(in), len); }
       void end_msg()
          {
-         s2k->change_salt(salt, salt.size());
-         s2k->set_iterations(iterations);
-         SymmetricKey x = s2k->derive_key(outlen, passphrase);
+         SymmetricKey x = s2k->derive_key(outlen, passphrase,
+                                          &salt[0], salt.size(),
+                                          iterations);
          send(x.bits_of());
          }
       S2K_Filter(S2K* algo, const SymmetricKey& s, u32bit o, u32bit i)