diff options
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: ../../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 */ diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index d0cecda8d7..23d6ead3ca 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -67,6 +67,7 @@ #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/dh.h> + #ifdef OPENSSL_FIPS #include <openssl/fips.h> #endif diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index 38b4f06012..485cff0b19 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -202,6 +202,7 @@ redo: if (BN_cmp(s,dsa->q) > 0) if (!BN_sub(s,s,dsa->q)) goto err; if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err; + ret=DSA_SIG_new(); if (ret == NULL) goto err; /* Redo if r or s is zero as required by FIPS 186-3: this is diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c index 3c7ced394b..178b655f7f 100644 --- a/crypto/ec/ecp_nistp521.c +++ b/crypto/ec/ecp_nistp521.c @@ -29,7 +29,12 @@ #include <openssl/opensslconf.h> #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +#ifndef OPENSSL_SYS_VMS #include <stdint.h> +#else +#include <inttypes.h> +#endif + #include <string.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile index 94793ce5bd..1530c1861e 100644 --- a/crypto/engine/Makefile +++ b/crypto/engine/Makefile @@ -111,6 +111,8 @@ eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h eng_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h eng_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h eng_cnf.o: ../cryptlib.h eng_cnf.c eng_int.h +eng_cryptodev.o: ../../crypto/dh/dh.h ../../crypto/dsa/dsa.h +eng_cryptodev.o: ../../crypto/err/err.h ../../crypto/rsa/rsa.h eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 7185eef1e6..6093376df4 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -70,7 +70,7 @@ void ENGINE_load_builtin_engines(void) * *no* builtin implementations). */ ENGINE_load_openssl(); #endif -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) +#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) ENGINE_load_cryptodev(); #endif #ifndef OPENSSL_NO_RSAX @@ -123,7 +123,7 @@ void ENGINE_load_builtin_engines(void) ENGINE_register_all_complete(); } -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) void ENGINE_setup_bsd_cryptodev(void) { static int bsd_cryptodev_default_loaded = 0; if (!bsd_cryptodev_default_loaded) { diff --git a/crypto/engine/eng_rsax.c b/crypto/engine/eng_rsax.c index 173aaf8d34..96e63477ee 100644 --- a/crypto/engine/eng_rsax.c +++ b/crypto/engine/eng_rsax.c @@ -399,6 +399,7 @@ static int mod_exp_pre_compute_data_512(UINT64 *m, struct mod_ctx_512 *data) /* Some tmps */ UINT64 _t[8]; int i, j, ret = 0; + /* Init _m with m */ BN_init(&_m); interleaved_array_to_bn_512(&_m, m); @@ -492,6 +493,7 @@ static int e_rsax_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx BIGNUM local_dmp1,local_dmq1,local_c,local_r1; BIGNUM *dmp1,*dmq1,*c,*pr1; int ret=0; + BN_CTX_start(ctx); r1 = BN_CTX_get(ctx); m1 = BN_CTX_get(ctx); diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index 1d8ab738ef..f8be497724 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -740,7 +740,7 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, * values. */ void *ENGINE_get_static_state(void); -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) void ENGINE_setup_bsd_cryptodev(void); #endif diff --git a/crypto/engine/enginetest.c b/crypto/engine/enginetest.c index 857403ddf9..f4d70e7e0a 100644 --- a/crypto/engine/enginetest.c +++ b/crypto/engine/enginetest.c @@ -58,7 +58,6 @@ #include <stdio.h> #include <string.h> -#include <openssl/crypto.h> #include <openssl/e_os2.h> #ifdef OPENSSL_NO_ENGINE diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 6b2dac1e37..90d6dbd528 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -278,7 +278,6 @@ e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_null.o: ../cryptlib.h e_null.c -e_old.o: e_old.c e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c index a5da52e62d..766c4cecdf 100644 --- a/crypto/evp/c_all.c +++ b/crypto/evp/c_all.c @@ -83,7 +83,7 @@ void OPENSSL_add_all_algorithms_noconf(void) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); #ifndef OPENSSL_NO_ENGINE -# if defined(__OpenBSD__) || defined(__FreeBSD__) +# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); # endif #endif diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c index 067a03cc59..9ca12ee243 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -99,4 +99,3 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, memcpy((char *)out,(const char *)in,inl); return 1; } - diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 649fcadd98..56563191ba 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, #if !defined(OPENSSL_NO_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(__INTEL__) ) && \ + !(defined(__APPLE__) && defined(__MACH__)) #define STITCHED_CALL #endif diff --git a/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c index 85acd4825e..aeb36ba2be 100644 --- a/crypto/evp/m_ecdsa.c +++ b/crypto/evp/m_ecdsa.c @@ -116,6 +116,7 @@ #include <openssl/sha.h> #ifndef OPENSSL_NO_SHA + static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 33dea162dc..42f1e5d9e7 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -66,7 +66,7 @@ int EVP_add_cipher(const EVP_CIPHER *c) { int r; - if (c == NULL) return(0); + if (c == NULL) return 0; r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); if (r == 0) return(0); diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c index e0c42e8596..e0962f751f 100644 --- a/crypto/md4/md4_dgst.c +++ b/crypto/md4/md4_dgst.c @@ -57,8 +57,8 @@ */ #include <stdio.h> -#include "md4_locl.h" #include <openssl/opensslv.h> +#include "md4_locl.h" const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; diff --git a/crypto/mem.c b/crypto/mem.c index b40a94ce1c..f7984fa958 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -101,7 +101,7 @@ static void (*free_locked_func)(void *) = free; /* may be changed as long as 'allow_customize_debug' is set */ /* XXX use correct function pointer types */ -#if defined(CRYPTO_MDEBUG) +#ifdef CRYPTO_MDEBUG /* use default functions from mem_dbg.c */ static void (*malloc_debug_func)(void *,int,const char *,int,int) = CRYPTO_dbg_malloc; @@ -121,8 +121,6 @@ static void (*set_debug_options_func)(long) = NULL; static long (*get_debug_options_func)(void) = NULL; #endif -extern void OPENSSL_init(void); - int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t), void (*f)(void *)) { diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c index 025c7f8897..f52d22fa15 100644 --- a/crypto/modes/gcm128.c +++ b/crypto/modes/gcm128.c @@ -1752,7 +1752,7 @@ int main() GHASH((&ctx),buf.c,sizeof(buf)); start = OPENSSL_rdtsc(); - for (i=0;i<100;++i) GHASH((&ctx),buf.c,sizeof(buf)); + for (i=0;i<100;++i) GHASH(&ctx,buf.c,sizeof(buf)); gcm_t = OPENSSL_rdtsc() - start; printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i); } diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index beece95c45..61d58502fd 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -204,10 +204,11 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, goto err; } } - err: + +err: PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_MALLOC_FAILURE); - end: +end: OPENSSL_free (Ai); OPENSSL_free (B); OPENSSL_free (D); diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile index e353c1a019..41c39644a7 100644 --- a/crypto/rand/Makefile +++ b/crypto/rand/Makefile @@ -86,11 +86,9 @@ md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h md_rand.o: md_rand.c rand_lcl.h -rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rand_egd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -rand_egd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_egd.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_egd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h +rand_egd.o: ../../include/openssl/opensslconf.h +rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h rand_egd.o: rand_egd.c rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index 9674219769..d53b916ebe 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -54,7 +54,6 @@ * */ -#include <openssl/crypto.h> #include <openssl/e_os2.h> #include <openssl/rand.h> #include <openssl/buffer.h> diff --git a/crypto/rand/randtest.c b/crypto/rand/randtest.c index bfa7275cfe..9e92a70b03 100644 --- a/crypto/rand/randtest.c +++ b/crypto/rand/randtest.c @@ -58,7 +58,6 @@ #include <stdio.h> #include <stdlib.h> -#include <openssl/crypto.h> #include <openssl/rand.h> #include "../e_os.h" diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c index dcee05ea74..4312605ccb 100644 --- a/crypto/rc4/rc4test.c +++ b/crypto/rc4/rc4test.c @@ -59,7 +59,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <openssl/crypto.h> #include "../e_os.h" @@ -122,7 +121,7 @@ int main(int argc, char *argv[]) unsigned char obuf[512]; #if !defined(OPENSSL_PIC) - void OPENSSL_cpuid_setup(); + void OPENSSL_cpuid_setup(void); OPENSSL_cpuid_setup(); #endif diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile index 59c5fcc8da..9d545d765e 100644 --- a/crypto/rsa/Makefile +++ b/crypto/rsa/Makefile @@ -219,11 +219,12 @@ rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h rsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -rsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rsa_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -rsa_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -rsa_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +rsa_pmeth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h +rsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +rsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +rsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h +rsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +rsa_pmeth.o: ../../include/openssl/objects.h rsa_pmeth.o: ../../include/openssl/opensslconf.h rsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 6e4334231c..9e3f7dafcd 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -90,12 +90,8 @@ const RSA_METHOD *RSA_get_default_method(void) #ifdef RSA_NULL default_RSA_meth=RSA_null_method(); #else -#if 0 /* was: #ifdef RSAref */ - default_RSA_meth=RSA_PKCS1_RSAref(); -#else default_RSA_meth=RSA_PKCS1_SSLeay(); #endif -#endif } return default_RSA_meth; diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile index b1582f2cff..79be651d92 100644 --- a/crypto/sha/Makefile +++ b/crypto/sha/Makefile @@ -59,7 +59,7 @@ sha512-ia64.s: asm/sha512-ia64.pl sha256-armv4.S: asm/sha256-armv4.pl $(PERL) $< $(PERLASM_SCHEME) $@ -sha1-alpha.s: asm/sha1-alpha.pl +sha1-alpha.s: asm/sha1-alpha.pl $(PERL) $< | $(CC) -E - | tee $@ > /dev/null # Solaris make has to be explicitly told diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c index 8eacf04534..db87899f05 100644 --- a/crypto/srp/srp_lib.c +++ b/crypto/srp/srp_lib.c @@ -328,7 +328,7 @@ int SRP_Verify_A_mod_N(BIGNUM *A, BIGNUM *N) /* Check if G and N are kwown parameters. The values have been generated from the ietf-tls-srp draft version 8 */ -char * SRP_check_known_gN_param(BIGNUM* g, BIGNUM* N) +char * SRP_check_known_gN_param(BIGNUM* g, BIGNUM* N) { size_t i; if ((g == NULL) || (N == NULL)) @@ -339,22 +339,22 @@ char * SRP_check_known_gN_param(BIGNUM* g, BIGNUM* N) for(i = 0; i < KNOWN_GN_NUMBER; i++) { - if (BN_cmp(knowngN[i].g,g) == 0 && BN_cmp(knowngN[i].N,N) == 0) + if (BN_cmp(knowngN[i].g, g) == 0 && BN_cmp(knowngN[i].N, N) == 0) return knowngN[i].id; } return NULL; } -SRP_gN *SRP_get_default_gN(const char * id) +SRP_gN *SRP_get_default_gN(const char *id) { - size_t i; + size_t i; if (id == NULL) return knowngN; for(i = 0; i < KNOWN_GN_NUMBER; i++) { - if (strcmp(knowngN[i].id,id)==0) - return knowngN+i; + if (strcmp(knowngN[i].id, id)==0) + return knowngN + i; } return NULL; } diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c index ba3dca074e..6889a6bded 100644 --- a/crypto/srp/srp_vfy.c +++ b/crypto/srp/srp_vfy.c @@ -84,7 +84,7 @@ static int t_fromb64(unsigned char *a, const char *src) while(*src && (*src == ' ' || *src == '\t' || *src == '\n')) ++src; - size = strlen((const char *)src); + size = strlen(src); i = 0; while(i < size) { @@ -190,9 +190,9 @@ static void SRP_user_pwd_free(SRP_user_pwd *user_pwd) OPENSSL_free(user_pwd); } -static SRP_user_pwd * SRP_user_pwd_new(void) +static SRP_user_pwd *SRP_user_pwd_new(void) { - SRP_user_pwd * ret = OPENSSL_malloc(sizeof(SRP_user_pwd)); + SRP_user_pwd *ret = OPENSSL_malloc(sizeof(SRP_user_pwd)); if (ret == NULL) return NULL; ret->N = NULL; @@ -222,7 +222,7 @@ static int SRP_user_pwd_set_ids(SRP_user_pwd *vinfo, const char *id, static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s, const char *v) { - unsigned char tmp[MAX_LEN]; + unsigned char tmp[MAX_LEN]; int len; if (strlen(s) > MAX_LEN || strlen(v) > MAX_LEN) @@ -234,7 +234,7 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s, return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL) ; } -static int SRP_user_pwd_set_sv_BN(SRP_user_pwd * vinfo, BIGNUM * s, BIGNUM * v) +static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v) { vinfo->v = v; vinfo->s = s; @@ -388,9 +388,9 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file) { last_index = SRP_get_default_gN(NULL)->id; } - for (i=0; i < sk_OPENSSL_PSTRING_num(tmpdb->data); i++) + for (i = 0; i < sk_OPENSSL_PSTRING_num(tmpdb->data); i++) { - pp=sk_OPENSSL_PSTRING_value(tmpdb->data,i); + pp = sk_OPENSSL_PSTRING_value(tmpdb->data,i); if (pp[DB_srptype][0] == DB_SRP_INDEX) { /*we add this couple in the internal Stack */ @@ -422,16 +422,14 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file) goto err; SRP_user_pwd_set_gN(user_pwd,lgN->g,lgN->N); - if (!SRP_user_pwd_set_ids(user_pwd, pp[DB_srpid], - pp[DB_srpinfo])) + if (!SRP_user_pwd_set_ids(user_pwd, pp[DB_srpid],pp[DB_srpinfo])) goto err; error_code = SRP_ERR_VBASE_BN_LIB; - if (!SRP_user_pwd_set_sv(user_pwd, pp[DB_srpsalt], - pp[DB_srpverifier])) + if (!SRP_user_pwd_set_sv(user_pwd, pp[DB_srpsalt],pp[DB_srpverifier])) goto err; - if (sk_SRP_user_pwd_insert(vb->users_pwd,user_pwd,0) == 0) + if (sk_SRP_user_pwd_insert(vb->users_pwd, user_pwd, 0) == 0) goto err; user_pwd = NULL; /* abandon responsability */ } @@ -543,7 +541,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt, if (N) { if (!(len = t_fromb64(tmp, N))) goto err; - N_bn = BN_bin2bn(tmp,len,NULL); + N_bn = BN_bin2bn(tmp, len, NULL); if (!(len = t_fromb64(tmp, g))) goto err; g_bn = BN_bin2bn(tmp, len, NULL); defgNid = "*"; @@ -568,7 +566,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt, { if (!(len = t_fromb64(tmp2, *salt))) goto err; - s = BN_bin2bn(tmp2,len,NULL); + s = BN_bin2bn(tmp2, len, NULL); } @@ -584,12 +582,12 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt, { char *tmp_salt; - if ((tmp_salt = OPENSSL_malloc(SRP_RANDOM_SALT_LEN*2)) == NULL) + if ((tmp_salt = OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL) { OPENSSL_free(vf); goto err; } - t_tob64(tmp_salt,tmp2,SRP_RANDOM_SALT_LEN); + t_tob64(tmp_salt, tmp2, SRP_RANDOM_SALT_LEN); *salt = tmp_salt; } diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h index 190e8a1bf2..c2448e3c3b 100644 --- a/crypto/ts/ts.h +++ b/crypto/ts/ts.h @@ -86,9 +86,6 @@ #include <openssl/dh.h> #endif -#include <openssl/evp.h> - - #ifdef __cplusplus extern "C" { #endif diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl index 808049a17d..9b097fc31f 100644 --- a/crypto/x86cpuid.pl +++ b/crypto/x86cpuid.pl @@ -196,7 +196,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &function_begin_B("OPENSSL_far_spin"); &pushf (); - &pop ("eax"); + &pop ("eax") &bt ("eax",9); &jnc (&label("nospin")); # interrupts are disabled |