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 | |
parent | a9e1c50bb09a110d4774e6710f9322344684fa2d (diff) |
Version skew reduction: trivia (I hope).
Diffstat (limited to 'crypto')
67 files changed, 161 insertions, 225 deletions
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c index 87545c34da..227f75625d 100644 --- a/crypto/aes/aes_cbc.c +++ b/crypto/aes/aes_cbc.c @@ -49,7 +49,6 @@ * */ -#include <openssl/crypto.h> #include <openssl/aes.h> #include <openssl/modes.h> diff --git a/crypto/aes/aes_cfb.c b/crypto/aes/aes_cfb.c index 7f19555603..0c6d058ce7 100644 --- a/crypto/aes/aes_cfb.c +++ b/crypto/aes/aes_cfb.c @@ -49,7 +49,6 @@ * */ -#include <openssl/crypto.h> #include <openssl/aes.h> #include <openssl/modes.h> diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c index f342bbdf87..28aa561c2d 100644 --- a/crypto/aes/aes_ecb.c +++ b/crypto/aes/aes_ecb.c @@ -56,7 +56,6 @@ #endif #include <assert.h> -#include <openssl/crypto.h> #include <openssl/aes.h> #include "aes_locl.h" diff --git a/crypto/aes/aes_ofb.c b/crypto/aes/aes_ofb.c index 7a87608a68..50bf0b8325 100644 --- a/crypto/aes/aes_ofb.c +++ b/crypto/aes/aes_ofb.c @@ -49,7 +49,6 @@ * */ -#include <openssl/crypto.h> #include <openssl/aes.h> #include <openssl/modes.h> diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c index c1c94d7a3e..d323e265c0 100644 --- a/crypto/aes/aes_x86core.c +++ b/crypto/aes/aes_x86core.c @@ -43,7 +43,6 @@ #include <assert.h> #include <stdlib.h> -#include <crypto/aes.h> #include <openssl/aes.h> #include "aes_locl.h" diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index 798085251e..c823a6b70a 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -100,7 +100,7 @@ x86_64-mont.s: asm/x86_64-mont.pl $(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@ x86_64-mont5.s: asm/x86_64-mont5.pl $(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@ -x86_64-gf2m.s: asm/x86_64-gf2m.pl +x86_64-gf2m.s: asm/x86_64-gf2m.pl $(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@ modexp512-x86_64.s: asm/modexp512-x86_64.pl $(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@ diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c index c086af6d0b..0145d0fa9b 100644 --- a/crypto/bn/bn_recp.c +++ b/crypto/bn/bn_recp.c @@ -62,7 +62,6 @@ #include "cryptlib.h" #include "bn_lcl.h" - void BN_RECP_CTX_init(BN_RECP_CTX *recp) { BN_init(&(recp->N)); 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> diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 2341b7b112..c85fe5aa3d 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -147,7 +147,7 @@ void OPENSSL_cpuid_setup(void) if ((env=getenv("OPENSSL_ia32cap"))) { int off = (env[0]=='~')?1:0; #if defined(_WIN32) - if (!sscanf(env+off,"%I64i",&vec)) vec = strtoul(env+off,NULL,0); + if (!sscanf(env+off,"%I64i",&vec)) vec = strtoul(env+off,NULL,0); #else if (!sscanf(env+off,"%lli",(long long *)&vec)) vec = strtoul(env+off,NULL,0); #endif diff --git a/crypto/crypto.h b/crypto/crypto.h index 040a989b23..d3da3c881f 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -565,6 +565,8 @@ int OPENSSL_isservice(void); int FIPS_mode(void); int FIPS_mode_set(int r); +void OPENSSL_init(void); + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. 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: . |