From 54b8bf4a1a9c00d17c6e1946a6f9f4cc0090b609 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 1 Feb 2010 16:31:03 +0000
Subject: 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.

---
 src/s2k/info.txt          | 1 -
 src/s2k/pbkdf1/pbkdf1.cpp | 1 +
 src/s2k/s2k.h             | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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 {
 
-- 
cgit v1.2.3