lib:crypto: Include only the required header files

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/lib/crypto/aes_ccm_128.c b/lib/crypto/aes_ccm_128.c
index a821e8d48a8470015bff935eafea2249621d0dfe..0cbc05567a877c69340ca2d8b299e7f55d774649 100644 (file)
--- a/lib/crypto/aes_ccm_128.c
+++ b/lib/crypto/aes_ccm_128.c
@@ -18,7 +18,8 @@
 */
 
 #include "replace.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_ccm_128.h"
 #include "lib/util/byteorder.h"
 
 #define M_ ((AES_CCM_128_M - 2) / 2)

diff --git a/lib/crypto/aes_ccm_128_test.c b/lib/crypto/aes_ccm_128_test.c
index 1a9fe411359b3474d1c27901313c1bc1e0400962..67745e3e1ae31b0104c2eba3e31e96d44cb42d8a 100644 (file)
--- a/lib/crypto/aes_ccm_128_test.c
+++ b/lib/crypto/aes_ccm_128_test.c
@@ -18,8 +18,9 @@
 */
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
-#include "../lib/crypto/aes_test.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_ccm_128.h"
+#include "lib/crypto/aes_test.h"
 
 #ifndef AES_CCM_128_ONLY_TESTVECTORS
 struct torture_context;

diff --git a/lib/crypto/aes_cmac_128.c b/lib/crypto/aes_cmac_128.c
index 5d71e82de0d40816390d94761371155efd33f00f..e5e489ec70df34b7b0ec2c7256ec8ead5b3ef011 100644 (file)
--- a/lib/crypto/aes_cmac_128.c
+++ b/lib/crypto/aes_cmac_128.c
@@ -19,7 +19,8 @@
 */
 
 #include "replace.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_cmac_128.h"
 
 static const uint8_t const_Zero[] = {
        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

diff --git a/lib/crypto/aes_cmac_128_test.c b/lib/crypto/aes_cmac_128_test.c
index 86a2fd73d0a55106baec6446c9cc811412390cfe..22f6fd8fe8bdbfe3a90bb7b72709d6e95b70d132 100644 (file)
--- a/lib/crypto/aes_cmac_128_test.c
+++ b/lib/crypto/aes_cmac_128_test.c
@@ -17,7 +17,8 @@
 */
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_cmac_128.h"
 
 struct torture_context;
 bool torture_local_crypto_aes_cmac_128(struct torture_context *torture);

diff --git a/lib/crypto/aes_gcm_128.c b/lib/crypto/aes_gcm_128.c
index bfbf176e53dc26d9a6d8e6f0811141a74e0de971..6b5a385cbd80dbb68d139a45023869bcb281baf6 100644 (file)
--- a/lib/crypto/aes_gcm_128.c
+++ b/lib/crypto/aes_gcm_128.c
@@ -18,7 +18,8 @@
 */
 
 #include "replace.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_gcm_128.h"
 #include "lib/util/byteorder.h"
 
 static inline void aes_gcm_128_inc32(uint8_t inout[AES_BLOCK_SIZE])

diff --git a/lib/crypto/aes_gcm_128_test.c b/lib/crypto/aes_gcm_128_test.c
index 6d2cbf2aed827ebad6213b7ca85532889c93bc1e..fdd87ff532d882f81e0ab4b2dd56d6dc1e92d2b8 100644 (file)
--- a/lib/crypto/aes_gcm_128_test.c
+++ b/lib/crypto/aes_gcm_128_test.c
@@ -18,8 +18,9 @@
 */
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
-#include "../lib/crypto/aes_test.h"
+#include "lib/crypto/aes.h"
+#include "lib/crypto/aes_gcm_128.h"
+#include "lib/crypto/aes_test.h"
 
 #ifndef AES_GCM_128_ONLY_TESTVECTORS
 struct torture_context;

diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index 6db2526969635a474a1c037857f14f4664ff7173..0e749dcaf229d696199445058723e464479de7b0 100644 (file)
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -18,7 +18,7 @@
 */
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/hmacmd5.h"
 
 struct torture_context;
 bool torture_local_crypto_hmacmd5(struct torture_context *torture);

diff --git a/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 36e321a0940642d3508f28e4618e5ab8f13a7e6c..15a74ef6f5e6273da0c59d278a7fd3bb18e1f0e7 100644 (file)
--- a/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
@@ -27,7 +27,8 @@
  */
 
 #include "replace.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/sha256.h"
+#include "lib/crypto/hmacsha256.h"
 
 /***********************************************************************
  the rfc 2104/2202 version of hmac_sha256 initialisation.

diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index dfdaef51b004ed1dbc15063724c3e7915d95daaf..1899dcd2046a2697cb9120a48908d4ca3ebeac4b 100644 (file)
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -19,7 +19,7 @@
 
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/md4.h"
 
 struct torture_context;
 bool torture_local_crypto_md4(struct torture_context *torture);

diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index f58e131b02dc10a135be1e32c94fa7fb14dc6c9d..01e5cc0bfcd327282bd27717f79f4004a6c6c475 100644 (file)
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -19,7 +19,7 @@
 
 #include "replace.h"
 #include "../lib/util/samba_util.h"
-#include "../lib/crypto/crypto.h"
+#include "lib/crypto/md5.h"
 
 struct torture_context;