diff options
| author | lloyd <[email protected]> | 2013-03-20 02:32:24 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-03-20 02:32:24 +0000 |
| commit | bd2cd28b7766b6d7d61960aa5b2dfaa491b664c2 (patch) | |
| tree | ed67bb056200a74b5867bec12cc7f4b01c12568e | |
| parent | 89f9ff94bf8f8d3f0acd5c0e28a5bb40e6e57cf8 (diff) | |
Update callers
| -rw-r--r-- | src/libstate/lookup.cpp | 4 | ||||
| -rw-r--r-- | src/libstate/lookup.h | 4 | ||||
| -rw-r--r-- | src/selftest/selftest.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libstate/lookup.cpp b/src/libstate/lookup.cpp index 1263c0897..5c5f038ee 100644 --- a/src/libstate/lookup.cpp +++ b/src/libstate/lookup.cpp @@ -108,12 +108,12 @@ Keyed_Filter* get_cipher(const std::string& algo_spec, key, InitializationVector(), direction); } -AEAD_Mode* get_aead(const std::string& algo_spec, +AEAD_Filter* get_aead(const std::string& algo_spec, Cipher_Dir direction) { std::unique_ptr<Keyed_Filter> c(get_cipher(algo_spec, direction)); - if(AEAD_Mode* aead = dynamic_cast<AEAD_Mode*>(c.get())) + if(AEAD_Filter* aead = dynamic_cast<AEAD_Filter*>(c.get())) { c.release(); return aead; diff --git a/src/libstate/lookup.h b/src/libstate/lookup.h index 2a47c7f14..c9d1ee707 100644 --- a/src/libstate/lookup.h +++ b/src/libstate/lookup.h @@ -11,7 +11,7 @@ #include <botan/libstate.h> #include <botan/engine.h> #include <botan/filters.h> -#include <botan/aead.h> +#include <botan/aead_filt.h> #include <botan/mode_pad.h> #include <botan/kdf.h> #include <botan/eme.h> @@ -227,7 +227,7 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& algo_spec, * decrypting filter * @return pointer to the encryption or decryption filter */ -BOTAN_DLL AEAD_Mode* get_aead(const std::string& algo_spec, +BOTAN_DLL AEAD_Filter* get_aead(const std::string& algo_spec, Cipher_Dir direction); /** diff --git a/src/selftest/selftest.cpp b/src/selftest/selftest.cpp index e291a8e9d..4be4f8751 100644 --- a/src/selftest/selftest.cpp +++ b/src/selftest/selftest.cpp @@ -7,7 +7,7 @@ #include <botan/selftest.h> #include <botan/filters.h> -#include <botan/aead.h> +#include <botan/aead_filt.h> #include <botan/hex.h> #include <botan/internal/core_engine.h> #include <botan/internal/stl_util.h> @@ -128,13 +128,13 @@ algorithm_kat_detailed(const SCAN_Name& algo_name, #if defined(BOTAN_HAS_AEAD) - if(AEAD_Mode* enc_aead = dynamic_cast<AEAD_Mode*>(enc)) + if(AEAD_Filter* enc_aead = dynamic_cast<AEAD_Filter*>(enc)) { const std::vector<byte> ad = hex_decode(search_map(vars, std::string("ad"))); enc_aead->set_associated_data(&ad[0], ad.size()); - if(AEAD_Mode* dec_aead = dynamic_cast<AEAD_Mode*>(dec)) + if(AEAD_Filter* dec_aead = dynamic_cast<AEAD_Filter*>(dec)) dec_aead->set_associated_data(&ad[0], ad.size()); } #endif |