aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-03-15 16:38:01 +0000
committerlloyd <[email protected]>2010-03-15 16:38:01 +0000
commitb44cd1b0e15da99561d6d1f1dfc927c5ee8d53ee (patch)
tree560c2035dcd23b4979d691b05f9889220aad798b /src
parent4ddc00f49519fc7661678417536bd02d4201b436 (diff)
Remove unneeded includes
Diffstat (limited to 'src')
-rw-r--r--src/engine/gnump/gnump_pk.cpp12
-rw-r--r--src/engine/openssl/openssl_pk.cpp15
2 files changed, 4 insertions, 23 deletions
diff --git a/src/engine/gnump/gnump_pk.cpp b/src/engine/gnump/gnump_pk.cpp
index 8d003a5d4..758e73520 100644
--- a/src/engine/gnump/gnump_pk.cpp
+++ b/src/engine/gnump/gnump_pk.cpp
@@ -19,22 +19,10 @@
#include <botan/rsa.h>
#endif
-#if defined(BOTAN_HAS_RW)
- #include <botan/rw.h>
-#endif
-
#if defined(BOTAN_HAS_DSA)
#include <botan/dsa.h>
#endif
-#if defined(BOTAN_HAS_ELGAMAL)
- #include <botan/elgamal.h>
-#endif
-
-#if defined(BOTAN_HAS_NYBERG_RUEPPEL)
- #include <botan/nr.h>
-#endif
-
#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
#include <botan/dh.h>
#endif
diff --git a/src/engine/openssl/openssl_pk.cpp b/src/engine/openssl/openssl_pk.cpp
index 8b8e83ebe..61bafef3c 100644
--- a/src/engine/openssl/openssl_pk.cpp
+++ b/src/engine/openssl/openssl_pk.cpp
@@ -12,20 +12,13 @@
#include <botan/rsa.h>
#endif
-#if defined(BOTAN_HAS_RW)
- #include <botan/rw.h>
-#endif
-
#if defined(BOTAN_HAS_DSA)
#include <botan/dsa.h>
#endif
-#if defined(BOTAN_HAS_ELGAMAL)
- #include <botan/elgamal.h>
-#endif
-
-#if defined(BOTAN_HAS_NYBERG_RUEPPEL)
- #include <botan/nr.h>
+#if defined(BOTAN_HAS_ECDSA)
+ #include <botan/ecdsa.h>
+ #include <openssl/ecdsa.h>
#endif
#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
@@ -183,7 +176,7 @@ bool OSSL_DSA_Verification_Operation::verify(const byte msg[], u32bit msg_len,
#if defined(BOTAN_HAS_RSA)
class OSSL_RSA_Private_Operation : public PK_Ops::Signature,
- public PK_Ops::Decryption
+ public PK_Ops::Decryption
{
public:
OSSL_RSA_Private_Operation(const RSA_PrivateKey& rsa) :