From ee9965d3a59112d042df7569fde6a45302491499 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 29 Sep 2008 19:09:22 +0000
Subject: Move KDF, EME, and EMSA base classes from pubkey to core to remove a
 false dependency on BigInt in the KDF/padding code.

---
 src/pk_pad/eme1/eme1.h         | 3 ++-
 src/pk_pad/eme_pkcs/eme_pkcs.h | 2 +-
 src/pk_pad/emsa1/emsa1.h       | 2 +-
 src/pk_pad/emsa2/emsa2.h       | 2 +-
 src/pk_pad/emsa3/emsa3.h       | 2 +-
 src/pk_pad/emsa4/emsa4.h       | 3 ++-
 src/pk_pad/emsa_raw/emsa_raw.h | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/pk_pad')

diff --git a/src/pk_pad/eme1/eme1.h b/src/pk_pad/eme1/eme1.h
index 2a0ac92c4..af8530470 100644
--- a/src/pk_pad/eme1/eme1.h
+++ b/src/pk_pad/eme1/eme1.h
@@ -6,7 +6,8 @@
 #ifndef BOTAN_EME1_H__
 #define BOTAN_EME1_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
+#include <botan/kdf.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/eme_pkcs/eme_pkcs.h b/src/pk_pad/eme_pkcs/eme_pkcs.h
index 9ec500c54..f23a9733d 100644
--- a/src/pk_pad/eme_pkcs/eme_pkcs.h
+++ b/src/pk_pad/eme_pkcs/eme_pkcs.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_EME_PKCS1_H__
 #define BOTAN_EME_PKCS1_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/emsa1/emsa1.h b/src/pk_pad/emsa1/emsa1.h
index f8d7ac043..c0eec8d17 100644
--- a/src/pk_pad/emsa1/emsa1.h
+++ b/src/pk_pad/emsa1/emsa1.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_EMSA1_H__
 #define BOTAN_EMSA1_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/emsa2/emsa2.h b/src/pk_pad/emsa2/emsa2.h
index 5db9593f8..79e21a8f8 100644
--- a/src/pk_pad/emsa2/emsa2.h
+++ b/src/pk_pad/emsa2/emsa2.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_EMSA2_H__
 #define BOTAN_EMSA2_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/emsa3/emsa3.h b/src/pk_pad/emsa3/emsa3.h
index fa8521216..bdaec5c42 100644
--- a/src/pk_pad/emsa3/emsa3.h
+++ b/src/pk_pad/emsa3/emsa3.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_EMSA3_H__
 #define BOTAN_EMSA3_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/emsa4/emsa4.h b/src/pk_pad/emsa4/emsa4.h
index f4d4a4b6d..8f2505281 100644
--- a/src/pk_pad/emsa4/emsa4.h
+++ b/src/pk_pad/emsa4/emsa4.h
@@ -6,7 +6,8 @@
 #ifndef BOTAN_EMSA4_H__
 #define BOTAN_EMSA4_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
+#include <botan/kdf.h>
 
 namespace Botan {
 
diff --git a/src/pk_pad/emsa_raw/emsa_raw.h b/src/pk_pad/emsa_raw/emsa_raw.h
index a9e21d0e0..923a390d3 100644
--- a/src/pk_pad/emsa_raw/emsa_raw.h
+++ b/src/pk_pad/emsa_raw/emsa_raw.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_EMSA_RAW_H__
 #define BOTAN_EMSA_RAW_H__
 
-#include <botan/pk_util.h>
+#include <botan/pk_pad.h>
 
 namespace Botan {
 
-- 
cgit v1.2.3