lib/crypto: only include what is needed.

Guenther

diff --git a/lib/crypto/arcfour.c b/lib/crypto/arcfour.c
index c57e05d0e9175c0d4615fea2952b50d25f89e23e..1afd659be6975f0746f41ab5128c6a05d7324267 100644 (file)
--- a/lib/crypto/arcfour.c
+++ b/lib/crypto/arcfour.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/arcfour.h"
 
 /* initialise the arcfour sbox with key */

diff --git a/lib/crypto/arcfour.h b/lib/crypto/arcfour.h
index 501b3f2fab620b8ec79dde9fc58e2927a3f844b5..a9f80c474d5a03d4211221fac6d067103bee179b 100644 (file)
--- a/lib/crypto/arcfour.h
+++ b/lib/crypto/arcfour.h
@@ -1,6 +1,8 @@
 #ifndef ARCFOUR_HEADER_H
 #define ARCFOUR_HEADER_H
 
+#include "../lib/util/data_blob.h"
+
 struct arcfour_state {
        uint8_t sbox[256];
        uint8_t index_i;

diff --git a/lib/crypto/crc32.c b/lib/crypto/crc32.c
index e6cc5297676d299d0101545988acc6baf903f848..cca62a0c046882c698dfe8bad64eb403804aa119 100644 (file)
--- a/lib/crypto/crc32.c
+++ b/lib/crypto/crc32.c
@@ -40,7 +40,7 @@
  * CRC32 code derived from work by Gary S. Brown.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/crc32.h"
 
 static const uint32_t crc32_tab[] = {

diff --git a/lib/crypto/hmacmd5.c b/lib/crypto/hmacmd5.c
index 0c8d1ab59835e77e79715009d9aa440c398c3b2c..cfbd428014baa8ae791e49517570dae077ab1045 100644 (file)
--- a/lib/crypto/hmacmd5.c
+++ b/lib/crypto/hmacmd5.c
@@ -22,7 +22,7 @@
  * for ntlmv2.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/hmacmd5.h"
 
 /***********************************************************************

diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index 77f305a5d39459a0b81853e213a303e854dcc5c5..a6621a6e135853b5aadb10e1fe92b3861cd8698f 100644 (file)
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -16,7 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;

diff --git a/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 53d4fe388396417dddba4aa56085dc7afaab93da..1a31441297d674834cf4858d2d797f1cadf869a6 100644 (file)
--- a/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
@@ -26,7 +26,7 @@
  taken direct from rfc2202 implementation and modified for suitable use
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/crypto.h"
 
 /***********************************************************************

diff --git a/lib/crypto/md4.c b/lib/crypto/md4.c
index aea2c821c5e66b3b1f310c30556b73b50d0c57c2..7eb6070cd44e2ac54a09b987c8b76ece842630ba 100644 (file)
--- a/lib/crypto/md4.c
+++ b/lib/crypto/md4.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/md4.h"
 
 /* NOTE: This code makes no attempt to be fast! 

diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index a6080cff823390fa0eb2d3c10fdab95b7320ad61..e406c692a12ad7d2e0cbb1868b56b8aa09d674ac 100644 (file)
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -17,7 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;

diff --git a/lib/crypto/md5.c b/lib/crypto/md5.c
index 566aacaf280c751dc4fecce660d428b955bdbec0..e6178cc015c5e0bed154c7a64c11cbe601b9a050 100644 (file)
--- a/lib/crypto/md5.c
+++ b/lib/crypto/md5.c
@@ -18,7 +18,7 @@
 /* This code slightly modified to fit into Samba by 
    abartlet@samba.org Jun 2001 */
 
-#include "includes.h"
+#include "replace.h"
 
 #include "md5.h"
 

diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 7223af211433dc4a25ed22d27863e4ad3540b493..0457d4d4ea4b18e947cd6db75760ba6a76e4049e 100644 (file)
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -17,7 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;

diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c
index 233abe23f8dc6c7aa0085a7e30ca977b0f1ac48b..42ab2363aa783771a263146fb697572f65eecba2 100644 (file)
--- a/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "sha256.h"
 
 #define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))