From: Andreas Schneider <asn@samba.org>
Date: Tue, 26 Feb 2019 17:30:22 +0000 (+0100)
Subject: lib:crypto: Include only the required header files
X-Git-Tag: talloc-2.2.0~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ee398e8b2071f2373f216b3ca79131a4b7ebed4;p=thirdparty%2Fsamba.git

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 a821e8d48a8..0cbc05567a8 100644
--- 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 1a9fe411359..67745e3e1ae 100644
--- 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 5d71e82de0d..e5e489ec70d 100644
--- 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 86a2fd73d0a..22f6fd8fe8b 100644
--- 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 bfbf176e53d..6b5a385cbd8 100644
--- 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 6d2cbf2aed8..fdd87ff532d 100644
--- 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 6db25269696..0e749dcaf22 100644
--- 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 36e321a0940..15a74ef6f5e 100644
--- 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 dfdaef51b00..1899dcd2046 100644
--- 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 f58e131b02d..01e5cc0bfcd 100644
--- 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;