diff options
| author | lloyd <[email protected]> | 2008-09-28 17:10:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-09-28 17:10:16 +0000 |
| commit | 1680c75cd7f583f213493731c50eeb6dd6fea74a (patch) | |
| tree | 3f7884ed4b4dedebd6113d53742844e72033c61f /src/def_alg.cpp | |
| parent | b677f899b4175dfb1e8910e219ade760cd716d95 (diff) | |
Modularize SSLv3 MAC and X9.19 MACs. Fix some feature macro inconsistencies.
Diffstat (limited to 'src/def_alg.cpp')
| -rw-r--r-- | src/def_alg.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/def_alg.cpp b/src/def_alg.cpp index 4cd48b1a3..64e27d480 100644 --- a/src/def_alg.cpp +++ b/src/def_alg.cpp @@ -40,7 +40,7 @@ #include <botan/lion.h> #endif -#ifdef BOTAN_HAS_LUBYRACK +#ifdef BOTAN_HAS_LUBY_RACKOFF #include <botan/lubyrack.h> #endif @@ -148,11 +148,11 @@ #include <botan/md5.h> #endif -#ifdef BOTAN_HAS_RIPEMD128 +#ifdef BOTAN_HAS_RIPEMD_128 #include <botan/rmd128.h> #endif -#ifdef BOTAN_HAS_RIPEMD160 +#ifdef BOTAN_HAS_RIPEMD_160 #include <botan/rmd160.h> #endif @@ -178,8 +178,14 @@ #include <botan/cbc_mac.h> #include <botan/cmac.h> #include <botan/hmac.h> + +#ifdef BOTAN_HAS_SSL3_MAC #include <botan/ssl3_mac.h> +#endif + +#ifdef BOTAN_HAS_ANSI_X919_MAC #include <botan/x919_mac.h> +#endif #include <botan/mode_pad.h> #include <botan/pgp_s2k.h> @@ -475,8 +481,14 @@ Default_Engine::find_mac(const std::string& algo_spec) const HANDLE_TYPE_ONE_STRING("CBC-MAC", CBC_MAC); HANDLE_TYPE_ONE_STRING("CMAC", CMAC); HANDLE_TYPE_ONE_STRING("HMAC", HMAC); + +#ifdef BOTAN_HAS_SSL3_MAC HANDLE_TYPE_ONE_STRING("SSL3-MAC", SSL3_MAC); +#endif + +#ifdef BOTAN_HAS_ANSI_X919_MAC HANDLE_TYPE_NO_ARGS("X9.19-MAC", ANSI_X919_MAC); +#endif return 0; } |