aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-02-01 16:31:03 +0000
committerlloyd <[email protected]>2010-02-01 16:31:03 +0000
commit54b8bf4a1a9c00d17c6e1946a6f9f4cc0090b609 (patch)
treec6585992b724b79c9de0f3cd0b10d40252c67f45
parent454e45b7c4fece11a7f43ffa412148b4a274c90f (diff)
Remove include of rng.h in s2k.h since it is no longer used. Add an
include for the exception types in pbkdf1 since previously it inherited that from the rng.h include.
-rw-r--r--src/s2k/info.txt1
-rw-r--r--src/s2k/pbkdf1/pbkdf1.cpp1
-rw-r--r--src/s2k/s2k.h1
3 files changed, 1 insertions, 2 deletions
diff --git a/src/s2k/info.txt b/src/s2k/info.txt
index 1d5226524..861b6f760 100644
--- a/src/s2k/info.txt
+++ b/src/s2k/info.txt
@@ -1,4 +1,3 @@
<requires>
-rng
sym_algo
</requires>
diff --git a/src/s2k/pbkdf1/pbkdf1.cpp b/src/s2k/pbkdf1/pbkdf1.cpp
index 8e521e988..a8270e26f 100644
--- a/src/s2k/pbkdf1/pbkdf1.cpp
+++ b/src/s2k/pbkdf1/pbkdf1.cpp
@@ -6,6 +6,7 @@
*/
#include <botan/pbkdf1.h>
+#include <botan/exceptn.h>
namespace Botan {
diff --git a/src/s2k/s2k.h b/src/s2k/s2k.h
index 82f5abeef..9ab71344e 100644
--- a/src/s2k/s2k.h
+++ b/src/s2k/s2k.h
@@ -9,7 +9,6 @@
#define BOTAN_S2K_H__
#include <botan/symkey.h>
-#include <botan/rng.h>
namespace Botan {