diff options
| author | lloyd <[email protected]> | 2010-03-05 16:25:43 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-05 16:25:43 +0000 |
| commit | c52cfb67263a9bb227c4b6fb0a0e37ab388f933a (patch) | |
| tree | fdd87d05cae6e30e84c60d518ae1f99f80bbabff /src/engine/def_engine | |
| parent | df56028cad58fad04b9866326cb62700af8f2fbe (diff) | |
Remove NR and DSA specific hooks
Diffstat (limited to 'src/engine/def_engine')
| -rw-r--r-- | src/engine/def_engine/def_pk_ops.cpp | 41 | ||||
| -rw-r--r-- | src/engine/def_engine/default_engine.h | 9 |
2 files changed, 3 insertions, 47 deletions
diff --git a/src/engine/def_engine/def_pk_ops.cpp b/src/engine/def_engine/def_pk_ops.cpp index 57d17f662..ce23cd8db 100644 --- a/src/engine/def_engine/def_pk_ops.cpp +++ b/src/engine/def_engine/def_pk_ops.cpp @@ -7,27 +7,13 @@ #include <botan/internal/default_engine.h> -#if defined(BOTAN_HAS_IF_PUBLIC_KEY_FAMILY) - #include <botan/if_op.h> -#endif - -#if defined(BOTAN_HAS_DSA) - #include <botan/dsa_op.h> -#endif - -#if defined(BOTAN_HAS_NYBERG_RUEPPEL) - #include <botan/nr_op.h> -#endif - -#if defined(BOTAN_HAS_ELGAMAL) - #include <botan/elg_op.h> -#endif - #if defined(BOTAN_HAS_RSA) + #include <botan/if_op.h> #include <botan/rsa.h> #endif #if defined(BOTAN_HAS_RW) + #include <botan/if_op.h> #include <botan/rw.h> #endif @@ -41,6 +27,7 @@ #if defined(BOTAN_HAS_ELGAMAL) #include <botan/elgamal.h> + #include <botan/elg_op.h> #endif #if defined(BOTAN_HAS_GOST_3410_2001) @@ -164,28 +151,6 @@ IF_Operation* Default_Engine::if_op(const BigInt& e, const BigInt& n, } #endif -#if defined(BOTAN_HAS_DSA) -/* -* Acquire a DSA op -*/ -DSA_Operation* Default_Engine::dsa_op(const DL_Group& group, const BigInt& y, - const BigInt& x) const - { - return new Default_DSA_Op(group, y, x); - } -#endif - -#if defined(BOTAN_HAS_NYBERG_RUEPPEL) -/* -* Acquire a NR op -*/ -NR_Operation* Default_Engine::nr_op(const DL_Group& group, const BigInt& y, - const BigInt& x) const - { - return new Default_NR_Op(group, y, x); - } -#endif - #if defined(BOTAN_HAS_ELGAMAL) /* * Acquire an ElGamal op diff --git a/src/engine/def_engine/default_engine.h b/src/engine/def_engine/default_engine.h index 4e21fb3a5..d74f61459 100644 --- a/src/engine/def_engine/default_engine.h +++ b/src/engine/def_engine/default_engine.h @@ -34,15 +34,6 @@ class Default_Engine : public Engine const BigInt&, const BigInt&) const; #endif -#if defined(BOTAN_HAS_DSA) - DSA_Operation* dsa_op(const DL_Group&, const BigInt&, - const BigInt&) const; -#endif - -#if defined(BOTAN_HAS_NYBERG_RUEPPEL) - NR_Operation* nr_op(const DL_Group&, const BigInt&, const BigInt&) const; -#endif - #if defined(BOTAN_HAS_ELGAMAL) ELG_Operation* elg_op(const DL_Group&, const BigInt&, const BigInt&) const; |