diff options
author | Ben Laurie <ben@openssl.org> | 2012-06-03 22:00:21 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2012-06-03 22:00:21 +0000 |
commit | 71fa451343f97b3624374ed1359adc23fba5696e (patch) | |
tree | 87ebfb43ece32507c68e360f36a67b4a921e79c0 /crypto/des | |
parent | a9e1c50bb09a110d4774e6710f9322344684fa2d (diff) | |
download | openssl-71fa451343f97b3624374ed1359adc23fba5696e.tar.gz |
Version skew reduction: trivia (I hope).
Diffstat (limited to 'crypto/des')
-rw-r--r-- | crypto/des/Makefile | 192 | ||||
-rw-r--r-- | crypto/des/cbc_cksm.c | 1 | ||||
-rw-r--r-- | crypto/des/cfb64ede.c | 1 | ||||
-rw-r--r-- | crypto/des/cfb64enc.c | 1 | ||||
-rw-r--r-- | crypto/des/cfb_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/des_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/des_old.c | 1 | ||||
-rw-r--r-- | crypto/des/des_old2.c | 1 | ||||
-rw-r--r-- | crypto/des/destest.c | 1 | ||||
-rw-r--r-- | crypto/des/ecb3_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/ecb_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/ede_cbcm_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/fcrypt.c | 3 | ||||
-rw-r--r-- | crypto/des/fcrypt_b.c | 1 | ||||
-rw-r--r-- | crypto/des/ncbc_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/ofb64ede.c | 1 | ||||
-rw-r--r-- | crypto/des/ofb64enc.c | 1 | ||||
-rw-r--r-- | crypto/des/ofb_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/pcbc_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/rand_key.c | 1 | ||||
-rw-r--r-- | crypto/des/rpc_enc.c | 1 | ||||
-rw-r--r-- | crypto/des/spr.h | 2 | ||||
-rw-r--r-- | crypto/des/xcbc_enc.c | 1 |
23 files changed, 90 insertions, 127 deletions
diff --git a/crypto/des/Makefile b/crypto/des/Makefile index dd5ecdb217..89f4fa8a75 100644 --- a/crypto/des/Makefile +++ b/crypto/des/Makefile @@ -107,70 +107,62 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -cbc_cksm.o: ../../include/openssl/opensslconf.h -cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cbc_cksm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cbc_cksm.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -cbc_cksm.o: ../../include/openssl/ui_compat.h cbc_cksm.c des_locl.h -cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +cbc_cksm.o: cbc_cksm.c des_locl.h +cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c -cfb64ede.o: ../../e_os.h ../../include/openssl/crypto.h -cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cfb64ede.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cfb64ede.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -cfb64ede.o: ../../include/openssl/ui_compat.h cfb64ede.c des_locl.h -cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -cfb64enc.o: ../../include/openssl/opensslconf.h -cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cfb64enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cfb64enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -cfb64enc.o: ../../include/openssl/ui_compat.h cfb64enc.c des_locl.h -cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h -cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cfb64ede.o: ../../e_os.h ../../include/openssl/des.h +cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h +cfb64ede.o: ../../include/openssl/opensslconf.h +cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +cfb64ede.o: cfb64ede.c des_locl.h +cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +cfb64enc.o: cfb64enc.c des_locl.h +cfb_enc.o: ../../e_os.h ../../include/openssl/des.h +cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h +cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h -des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h -des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +des_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h +des_enc.o: ../../include/openssl/ui_compat.h ../crypto.h des_enc.c des_locl.h +des_enc.o: ncbc_enc.c spr.h +des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h des_old.o: ../../include/openssl/ui_compat.h des_old.c -des_old2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -des_old2.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -des_old2.o: ../../include/openssl/opensslconf.h -des_old2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -des_old2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -des_old2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -des_old2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -des_old2.o: des_old2.c -ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -ecb3_enc.o: ../../include/openssl/opensslconf.h -ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecb3_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecb3_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ecb3_enc.o: ../../include/openssl/ui_compat.h des_locl.h ecb3_enc.c +des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h +des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h +des_old2.o: ../../include/openssl/ui_compat.h des_old2.c +ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +ecb3_enc.o: des_locl.h ecb3_enc.c ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h @@ -178,10 +170,9 @@ ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c -ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h +ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +ede_cbcm_enc.o: ../../include/openssl/e_os2.h ede_cbcm_enc.o: ../../include/openssl/opensslconf.h -ede_cbcm_enc.o: ../../include/openssl/opensslv.h ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h @@ -213,55 +204,48 @@ fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h fcrypt.o: des_locl.h fcrypt.c -fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -fcrypt_b.o: ../../include/openssl/opensslconf.h -fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -fcrypt_b.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -fcrypt_b.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -fcrypt_b.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt_b.c -ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -ofb64ede.o: ../../include/openssl/opensslconf.h -ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ofb64ede.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ofb64ede.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ofb64ede.o: ../../include/openssl/ui_compat.h des_locl.h ofb64ede.c -ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -ofb64enc.o: ../../include/openssl/opensslconf.h -ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ofb64enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ofb64enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ofb64enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb64enc.c -ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +fcrypt_b.o: des_locl.h fcrypt_b.c +ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +ofb64ede.o: des_locl.h ofb64ede.c +ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +ofb64enc.o: des_locl.h ofb64enc.c +ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h ofb_enc.o: des_locl.h ofb_enc.c -pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -pcbc_enc.o: ../../include/openssl/opensslconf.h -pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pcbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -pcbc_enc.o: ../../include/openssl/ui_compat.h des_locl.h pcbc_enc.c +pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +pcbc_enc.o: des_locl.h pcbc_enc.c qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h qud_cksm.o: des_locl.h qud_cksm.c -rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -rand_key.o: ../../include/openssl/opensslconf.h -rand_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rand_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -rand_key.o: rand_key.c +rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h +rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h +rand_key.o: ../../include/openssl/ui_compat.h rand_key.c read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h read2pwd.o: ../../include/openssl/opensslconf.h @@ -269,9 +253,8 @@ read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c -rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h @@ -290,10 +273,9 @@ str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h str2key.o: des_locl.h str2key.c -xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -xcbc_enc.o: ../../include/openssl/opensslconf.h -xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -xcbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -xcbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -xcbc_enc.o: ../../include/openssl/ui_compat.h des_locl.h xcbc_enc.c +xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h +xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h +xcbc_enc.o: des_locl.h xcbc_enc.c diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c index 8413c81b6b..09a7ba56aa 100644 --- a/crypto/des/cbc_cksm.c +++ b/crypto/des/cbc_cksm.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output, diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c index 40da95888c..de34ecceb9 100644 --- a/crypto/des/cfb64ede.c +++ b/crypto/des/cfb64ede.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" #include "e_os.h" diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c index 45fa518936..5ec8683e40 100644 --- a/crypto/des/cfb64enc.c +++ b/crypto/des/cfb64enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" /* The input and output encrypted as though 64bit cfb mode is being diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c index d8c195e1d6..720f29a28e 100644 --- a/crypto/des/cfb_enc.c +++ b/crypto/des/cfb_enc.c @@ -57,7 +57,6 @@ */ #include "e_os.h" -#include <openssl/crypto.h> #include "des_locl.h" #include <assert.h> diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index efe35aa3c5..828feba208 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" #include "spr.h" diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c index 4102652100..7c33ed7a93 100644 --- a/crypto/des/des_old.c +++ b/crypto/des/des_old.c @@ -73,7 +73,6 @@ */ #define OPENSSL_DES_LIBDES_COMPATIBILITY -#include <openssl/crypto.h> #include <openssl/des.h> #include <openssl/rand.h> diff --git a/crypto/des/des_old2.c b/crypto/des/des_old2.c index 4615f25388..c8fa3ee135 100644 --- a/crypto/des/des_old2.c +++ b/crypto/des/des_old2.c @@ -73,7 +73,6 @@ */ #undef OPENSSL_DES_LIBDES_COMPATIBILITY -#include <openssl/crypto.h> #include <openssl/des.h> #include <openssl/rand.h> diff --git a/crypto/des/destest.c b/crypto/des/destest.c index 9d02b90811..64b92a34fe 100644 --- a/crypto/des/destest.c +++ b/crypto/des/destest.c @@ -59,7 +59,6 @@ #include <stdio.h> #include <stdlib.h> -#include <openssl/crypto.h> #include <openssl/e_os2.h> #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS) #ifndef OPENSSL_SYS_MSDOS diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c index 420c5d13f4..c3437bc606 100644 --- a/crypto/des/ecb3_enc.c +++ b/crypto/des/ecb3_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index de4ede1a7b..0684e769b3 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" #include "des_ver.h" #include <openssl/opensslv.h> diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c index 57548af8b2..adfcb75cf3 100644 --- a/crypto/des/ede_cbcm_enc.c +++ b/crypto/des/ede_cbcm_enc.c @@ -68,7 +68,6 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz */ -#include <openssl/crypto.h> #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_DESCBCM is defined */ #ifndef OPENSSL_NO_DESCBCM diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c index 91811168c6..de0a528640 100644 --- a/crypto/des/fcrypt.c +++ b/crypto/des/fcrypt.c @@ -9,8 +9,6 @@ #include <openssl/ebcdic.h> #endif -#include <openssl/crypto.h> - /* This version of crypt has been developed from my MIT compatible * DES library. * Eric Young (eay@cryptsoft.com) @@ -24,6 +22,7 @@ * defined 24. */ +#include <openssl/crypto.h> #include "des_locl.h" /* Added more values to handle illegal salt values the way normal diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c index 18d7ffc18c..8822816938 100644 --- a/crypto/des/fcrypt_b.c +++ b/crypto/des/fcrypt_b.c @@ -57,7 +57,6 @@ */ #include <stdio.h> -#include <openssl/crypto.h> /* This version of crypt has been developed from my MIT compatible * DES library. diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c index dc3dff1431..fda23d522f 100644 --- a/crypto/des/ncbc_enc.c +++ b/crypto/des/ncbc_enc.c @@ -61,7 +61,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" #ifdef CBC_ENC_C__DONT_UPDATE_IV diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c index 089407b69f..26bbf9a6a7 100644 --- a/crypto/des/ofb64ede.c +++ b/crypto/des/ofb64ede.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" /* The input and output encrypted as though 64bit ofb mode is being diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c index 368c6ad04f..8ca3d49dea 100644 --- a/crypto/des/ofb64enc.c +++ b/crypto/des/ofb64enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" /* The input and output encrypted as though 64bit ofb mode is being diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c index 8ce7aba5c6..e887a3c6f4 100644 --- a/crypto/des/ofb_enc.c +++ b/crypto/des/ofb_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" /* The input and output are loaded in multiples of 8 bits. diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c index 7760e34fa6..17a40f9520 100644 --- a/crypto/des/pcbc_enc.c +++ b/crypto/des/pcbc_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c index 6811c04ac3..2398165568 100644 --- a/crypto/des/rand_key.c +++ b/crypto/des/rand_key.c @@ -53,7 +53,6 @@ * */ -#include <openssl/crypto.h> #include <openssl/des.h> #include <openssl/rand.h> diff --git a/crypto/des/rpc_enc.c b/crypto/des/rpc_enc.c index 5e88c55c99..d937d08da5 100644 --- a/crypto/des/rpc_enc.c +++ b/crypto/des/rpc_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "rpc_des.h" #include "des_locl.h" #include "des_ver.h" diff --git a/crypto/des/spr.h b/crypto/des/spr.h index 9be0dce9f6..163901ff30 100644 --- a/crypto/des/spr.h +++ b/crypto/des/spr.h @@ -56,6 +56,8 @@ * [including the GNU Public Licence.] */ +#include <crypto.h> + __fips_constseg OPENSSL_GLOBAL const DES_LONG DES_SPtrans[8][64]={ { diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c index 6a66951733..058cab6bce 100644 --- a/crypto/des/xcbc_enc.c +++ b/crypto/des/xcbc_enc.c @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include "des_locl.h" /* RSA's DESX */ |