diff options
| author | Jack Lloyd <[email protected]> | 2017-09-21 15:04:25 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-21 15:04:25 -0400 |
| commit | 5d48c1406a956496fd4a020263ee59fbe7fad90a (patch) | |
| tree | 4ea0847f71eda94c0ff3a31cfe4167ca2dba8db6 /src/lib/modes | |
| parent | 5cc5e1bd3fac87186f511a48cee9cda86e4607ca (diff) | |
Header file cleanups
Some help from include-what-you-use
Diffstat (limited to 'src/lib/modes')
| -rw-r--r-- | src/lib/modes/aead/aead.cpp | 1 | ||||
| -rw-r--r-- | src/lib/modes/aead/ccm/ccm.cpp | 2 | ||||
| -rw-r--r-- | src/lib/modes/aead/ccm/ccm.h | 2 | ||||
| -rw-r--r-- | src/lib/modes/aead/eax/eax.cpp | 1 | ||||
| -rw-r--r-- | src/lib/modes/aead/siv/siv.cpp | 1 | ||||
| -rw-r--r-- | src/lib/modes/cfb/cfb.cpp | 1 | ||||
| -rw-r--r-- | src/lib/modes/cipher_mode.cpp | 5 | ||||
| -rw-r--r-- | src/lib/modes/xts/xts.cpp | 1 |
8 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/modes/aead/aead.cpp b/src/lib/modes/aead/aead.cpp index 1b7b78be7..e8885dc0e 100644 --- a/src/lib/modes/aead/aead.cpp +++ b/src/lib/modes/aead/aead.cpp @@ -6,6 +6,7 @@ #include <botan/aead.h> #include <botan/scan_name.h> +#include <botan/parsing.h> #include <sstream> #if defined(BOTAN_HAS_BLOCK_CIPHER) diff --git a/src/lib/modes/aead/ccm/ccm.cpp b/src/lib/modes/aead/ccm/ccm.cpp index 5a1de4908..6149718f0 100644 --- a/src/lib/modes/aead/ccm/ccm.cpp +++ b/src/lib/modes/aead/ccm/ccm.cpp @@ -7,7 +7,7 @@ */ #include <botan/ccm.h> -#include <botan/parsing.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h index 38c0affe7..4d4fe73e2 100644 --- a/src/lib/modes/aead/ccm/ccm.h +++ b/src/lib/modes/aead/ccm/ccm.h @@ -11,8 +11,6 @@ #include <botan/aead.h> #include <botan/block_cipher.h> -#include <botan/stream_cipher.h> -#include <botan/mac.h> namespace Botan { diff --git a/src/lib/modes/aead/eax/eax.cpp b/src/lib/modes/aead/eax/eax.cpp index 66cd90151..dd0e458e7 100644 --- a/src/lib/modes/aead/eax/eax.cpp +++ b/src/lib/modes/aead/eax/eax.cpp @@ -9,7 +9,6 @@ #include <botan/eax.h> #include <botan/cmac.h> #include <botan/ctr.h> -#include <botan/parsing.h> namespace Botan { diff --git a/src/lib/modes/aead/siv/siv.cpp b/src/lib/modes/aead/siv/siv.cpp index 70545243b..8e3d07059 100644 --- a/src/lib/modes/aead/siv/siv.cpp +++ b/src/lib/modes/aead/siv/siv.cpp @@ -10,7 +10,6 @@ #include <botan/cmac.h> #include <botan/internal/poly_dbl.h> #include <botan/ctr.h> -#include <botan/parsing.h> namespace Botan { diff --git a/src/lib/modes/cfb/cfb.cpp b/src/lib/modes/cfb/cfb.cpp index d22f1a35b..63904ed27 100644 --- a/src/lib/modes/cfb/cfb.cpp +++ b/src/lib/modes/cfb/cfb.cpp @@ -7,7 +7,6 @@ */ #include <botan/cfb.h> -#include <botan/parsing.h> namespace Botan { diff --git a/src/lib/modes/cipher_mode.cpp b/src/lib/modes/cipher_mode.cpp index 74d565f33..6023102da 100644 --- a/src/lib/modes/cipher_mode.cpp +++ b/src/lib/modes/cipher_mode.cpp @@ -8,6 +8,7 @@ #include <botan/cipher_mode.h> #include <botan/stream_mode.h> #include <botan/scan_name.h> +#include <botan/parsing.h> #include <sstream> #if defined(BOTAN_HAS_BLOCK_CIPHER) @@ -30,10 +31,6 @@ #include <botan/xts.h> #endif -#if defined(BOTAN_HAS_MODE_XTS) - #include <botan/xts.h> -#endif - #if defined(BOTAN_HAS_OPENSSL) #include <botan/internal/openssl.h> #endif diff --git a/src/lib/modes/xts/xts.cpp b/src/lib/modes/xts/xts.cpp index 4a4250f84..53e959258 100644 --- a/src/lib/modes/xts/xts.cpp +++ b/src/lib/modes/xts/xts.cpp @@ -7,7 +7,6 @@ */ #include <botan/xts.h> -#include <botan/loadstor.h> #include <botan/internal/poly_dbl.h> namespace Botan { |