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/kdf | |
| parent | 5cc5e1bd3fac87186f511a48cee9cda86e4607ca (diff) | |
Header file cleanups
Some help from include-what-you-use
Diffstat (limited to 'src/lib/kdf')
| -rw-r--r-- | src/lib/kdf/hkdf/hkdf.h | 1 | ||||
| -rw-r--r-- | src/lib/kdf/kdf.cpp | 6 | ||||
| -rw-r--r-- | src/lib/kdf/prf_tls/prf_tls.cpp | 1 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_108/sp800_108.cpp | 1 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_56a/sp800_56a.cpp | 1 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_56c/sp800_56c.cpp | 2 |
6 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/kdf/hkdf/hkdf.h b/src/lib/kdf/hkdf/hkdf.h index 1d8d3c159..e63973497 100644 --- a/src/lib/kdf/hkdf/hkdf.h +++ b/src/lib/kdf/hkdf/hkdf.h @@ -10,7 +10,6 @@ #define BOTAN_HKDF_H_ #include <botan/mac.h> -#include <botan/hash.h> #include <botan/kdf.h> namespace Botan { diff --git a/src/lib/kdf/kdf.cpp b/src/lib/kdf/kdf.cpp index 4b55b6962..f3d962c14 100644 --- a/src/lib/kdf/kdf.cpp +++ b/src/lib/kdf/kdf.cpp @@ -26,11 +26,7 @@ #include <botan/kdf1_iso18033.h> #endif -#if defined(BOTAN_HAS_TLS_V10_PRF) -#include <botan/prf_tls.h> -#endif - -#if defined(BOTAN_HAS_TLS_V12_PRF) +#if defined(BOTAN_HAS_TLS_V10_PRF) || defined(BOTAN_HAS_TLS_V12_PRF) #include <botan/prf_tls.h> #endif diff --git a/src/lib/kdf/prf_tls/prf_tls.cpp b/src/lib/kdf/prf_tls/prf_tls.cpp index ead41f505..69383e98e 100644 --- a/src/lib/kdf/prf_tls/prf_tls.cpp +++ b/src/lib/kdf/prf_tls/prf_tls.cpp @@ -6,7 +6,6 @@ */ #include <botan/prf_tls.h> -#include <botan/hmac.h> namespace Botan { diff --git a/src/lib/kdf/sp800_108/sp800_108.cpp b/src/lib/kdf/sp800_108/sp800_108.cpp index 8b1af2ea7..0f9eed1f2 100644 --- a/src/lib/kdf/sp800_108/sp800_108.cpp +++ b/src/lib/kdf/sp800_108/sp800_108.cpp @@ -6,7 +6,6 @@ */ #include <botan/sp800_108.h> -#include <botan/hmac.h> #include <iterator> diff --git a/src/lib/kdf/sp800_56a/sp800_56a.cpp b/src/lib/kdf/sp800_56a/sp800_56a.cpp index 8698e5bee..8e9bcf856 100644 --- a/src/lib/kdf/sp800_56a/sp800_56a.cpp +++ b/src/lib/kdf/sp800_56a/sp800_56a.cpp @@ -7,7 +7,6 @@ */ #include <botan/sp800_56a.h> -#include <botan/hmac.h> #include <botan/scan_name.h> #include <botan/exceptn.h> diff --git a/src/lib/kdf/sp800_56c/sp800_56c.cpp b/src/lib/kdf/sp800_56c/sp800_56c.cpp index 30a49e8ee..544a650ea 100644 --- a/src/lib/kdf/sp800_56c/sp800_56c.cpp +++ b/src/lib/kdf/sp800_56c/sp800_56c.cpp @@ -5,9 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/sp800_108.h> #include <botan/sp800_56c.h> -#include <botan/hmac.h> namespace Botan { |