Include <string> in buf_comp.h and filter.h as we used std::string but

were not including it in the header chain.  Caused compilation
failures using Clang 3.1 using libc++.

Remove the 3-argument version of hash_seq in SRP6, was not being used.

3 files changed, 2 insertions, 16 deletions

diff --git a/src/algo_base/buf_comp.h b/src/algo_base/buf_comp.h
index 87b57d252..1dd8be992 100644
--- a/src/algo_base/buf_comp.h
+++ b/src/algo_base/buf_comp.h
@@ -10,6 +10,7 @@
 
 #include <botan/secmem.h>
 #include <botan/get_byte.h>
+#include <string>
 
 namespace Botan {
 
diff --git a/src/constructs/srp6/srp6.cpp b/src/constructs/srp6/srp6.cpp
index 569454350..f1927b648 100644
--- a/src/constructs/srp6/srp6.cpp
+++ b/src/constructs/srp6/srp6.cpp
@@ -29,22 +29,6 @@ BigInt hash_seq(const std::string& hash_id,
    return BigInt::decode(hash_fn->final());
    }
 
-BigInt hash_seq(const std::string& hash_id,
-                size_t pad_to,
-                const BigInt& in1,
-                const BigInt& in2,
-                const BigInt& in3)
-   {
-   std::unique_ptr<HashFunction> hash_fn(
-      global_state().algorithm_factory().make_hash_function(hash_id));
-
-   hash_fn->update(BigInt::encode_1363(in1, pad_to));
-   hash_fn->update(BigInt::encode_1363(in2, pad_to));
-   hash_fn->update(BigInt::encode_1363(in3, pad_to));
-
-   return BigInt::decode(hash_fn->final());
-   }
-
 BigInt compute_x(const std::string& hash_id,
                  const std::string& identifier,
                  const std::string& password,
diff --git a/src/filters/filter.h b/src/filters/filter.h
index f59677528..581d95c58 100644
--- a/src/filters/filter.h
+++ b/src/filters/filter.h
@@ -10,6 +10,7 @@
 
 #include <botan/secmem.h>
 #include <vector>
+#include <string>
 
 namespace Botan {