diff options
| author | lloyd <[email protected]> | 2008-10-01 14:31:24 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-10-01 14:31:24 +0000 |
| commit | 927b1a4b991fd7d4893c9f733f79ac015690e7b9 (patch) | |
| tree | 431480eefd3cad4cb10392970febb7f20bbb586d | |
| parent | 65fff4aee41bdc473ef2e5c435de31d9a25a6fe7 (diff) | |
Add missing include in ec.h. Remove macro guards in ecc_core.*, not needed since in ecdsa module
| -rw-r--r-- | src/pk/ecdsa/ec.h | 1 | ||||
| -rw-r--r-- | src/pk/ecdsa/ecc_core.cpp | 3 | ||||
| -rw-r--r-- | src/pk/ecdsa/ecc_core.h | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/pk/ecdsa/ec.h b/src/pk/ecdsa/ec.h index 48460ba0c..7a0b3cbba 100644 --- a/src/pk/ecdsa/ec.h +++ b/src/pk/ecdsa/ec.h @@ -12,6 +12,7 @@ #include <botan/curve_gfp.h> #include <botan/pk_keys.h> #include <botan/ec_dompar.h> +#include <botan/ecc_core.h> namespace Botan { diff --git a/src/pk/ecdsa/ecc_core.cpp b/src/pk/ecdsa/ecc_core.cpp index 8d1d48b49..f644e231c 100644 --- a/src/pk/ecdsa/ecc_core.cpp +++ b/src/pk/ecdsa/ecc_core.cpp @@ -11,8 +11,6 @@ namespace Botan { -#if defined(BOTAN_HAS_ECDSA) - /************************************************* * ECKAEG_Core Constructor * *************************************************/ @@ -90,6 +88,5 @@ ECDSA_Core::ECDSA_Core(EC_Domain_Params const& dom_pars, const BigInt& priv_key, { op = Engine_Core::ecdsa_op(dom_pars, priv_key, pub_key); } -#endif } diff --git a/src/pk/ecdsa/ecc_core.h b/src/pk/ecdsa/ecc_core.h index 1124eaa2f..4f840bf06 100644 --- a/src/pk/ecdsa/ecc_core.h +++ b/src/pk/ecdsa/ecc_core.h @@ -10,14 +10,10 @@ #include <botan/bigint.h> #include <botan/blinding.h> #include <botan/pk_ops.h> - -#if defined(BOTAN_HAS_ECDSA) - #include <botan/ec_dompar.h> -#endif +#include <botan/ec_dompar.h> namespace Botan { -#if defined(BOTAN_HAS_ECDSA) /************************************************* * ECDSA Core * *************************************************/ @@ -67,7 +63,6 @@ class ECKAEG_Core ECKAEG_Operation* op; Blinder blinder; }; -#endif } |