Version skew reduction: trivia (I hope).

6 files changed, 10 insertions, 29 deletions

diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile
index 3e2b8fbf0a..8858dd057d 100644
--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@@ -88,32 +88,16 @@ clean:
 
 camellia.o: ../../include/openssl/opensslconf.h camellia.c camellia.h
 camellia.o: cmll_locl.h
-cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h
-cmll_cbc.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
-cmll_cbc.o: ../../include/openssl/opensslconf.h
-cmll_cbc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-cmll_cbc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cmll_cbc.o: ../../include/openssl/symhacks.h cmll_cbc.c
-cmll_cfb.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h
-cmll_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
-cmll_cfb.o: ../../include/openssl/opensslconf.h
-cmll_cfb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-cmll_cfb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cmll_cfb.o: ../../include/openssl/symhacks.h cmll_cfb.c
-cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h
-cmll_ctr.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
-cmll_ctr.o: ../../include/openssl/opensslconf.h
-cmll_ctr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-cmll_ctr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cmll_ctr.o: ../../include/openssl/symhacks.h cmll_ctr.c
+cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_cbc.o: ../../include/openssl/opensslconf.h cmll_cbc.c
+cmll_cfb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_cfb.o: ../../include/openssl/opensslconf.h cmll_cfb.c
+cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_ctr.o: ../../include/openssl/opensslconf.h cmll_ctr.c
 cmll_ecb.o: ../../include/openssl/camellia.h
 cmll_ecb.o: ../../include/openssl/opensslconf.h cmll_ecb.c cmll_locl.h
 cmll_misc.o: ../../include/openssl/camellia.h
 cmll_misc.o: ../../include/openssl/opensslconf.h
 cmll_misc.o: ../../include/openssl/opensslv.h cmll_locl.h cmll_misc.c
-cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h
-cmll_ofb.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
-cmll_ofb.o: ../../include/openssl/opensslconf.h
-cmll_ofb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-cmll_ofb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-cmll_ofb.o: ../../include/openssl/symhacks.h cmll_ofb.c
+cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_ofb.o: ../../include/openssl/opensslconf.h cmll_ofb.c
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 158daea704..4c8d455ade 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -49,7 +49,6 @@
  *
  */
 
-#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
index 97cc0e7201..3d81b51d3f 100644
--- a/crypto/camellia/cmll_cfb.c
+++ b/crypto/camellia/cmll_cfb.c
@@ -105,7 +105,6 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 6d993bd204..014e621a34 100644
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -49,7 +49,6 @@
  *
  */
 
-#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h
index 4a4d880d16..0d931fdf90 100644
--- a/crypto/camellia/cmll_locl.h
+++ b/crypto/camellia/cmll_locl.h
@@ -71,7 +71,8 @@
 typedef unsigned int  u32;
 typedef unsigned char u8;
 
-int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE keyTable);
+int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey,
+		     KEY_TABLE_TYPE keyTable);
 void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], 
 		const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
 void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[], 
diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
index 4f5644f7a5..a482befc74 100644
--- a/crypto/camellia/cmll_ofb.c
+++ b/crypto/camellia/cmll_ofb.c
@@ -105,7 +105,6 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>