diff options
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/Makefile.ssl | 127 | ||||
| -rw-r--r-- | crypto/engine/engine_all.c | 40 | ||||
| -rw-r--r-- | crypto/engine/engine_err.c | 4 | ||||
| -rw-r--r-- | crypto/engine/engine_int.h | 24 | ||||
| -rw-r--r-- | crypto/engine/hw_atalla.c | 8 | ||||
| -rw-r--r-- | crypto/engine/hw_cswift.c | 8 | ||||
| -rw-r--r-- | crypto/engine/hw_ncipher.c | 8 | ||||
| -rw-r--r-- | crypto/engine/hw_nuron.c | 8 | ||||
| -rw-r--r-- | crypto/engine/hw_ubsec.c | 8 | ||||
| -rw-r--r-- | crypto/engine/vendor_defns/cswift.h | 8 |
10 files changed, 123 insertions, 120 deletions
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl index cbd9ad739e..05236a7161 100644 --- a/crypto/engine/Makefile.ssl +++ b/crypto/engine/Makefile.ssl @@ -11,7 +11,8 @@ INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl MAKE= make -f Makefile.ssl -MAKEDEPEND= $(TOP)/util/domd $(TOP) +MAKEDEPPROG= makedepend +MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile.ssl AR= ar r @@ -98,7 +99,7 @@ engine_all.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h engine_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h engine_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h engine_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -engine_all.o: ../../include/openssl/symhacks.h engine_int.h +engine_all.o: ../../include/openssl/symhacks.h engine_all.c engine_int.h engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h engine_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h @@ -117,19 +118,19 @@ engine_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h engine_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h engine_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h engine_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -engine_err.o: ../../include/openssl/symhacks.h +engine_err.o: ../../include/openssl/symhacks.h engine_err.c engine_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h engine_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h engine_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h engine_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h engine_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -engine_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os.h -engine_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h -engine_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -engine_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h -engine_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -engine_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h -engine_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +engine_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h +engine_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h +engine_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +engine_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h +engine_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h +engine_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +engine_lib.o: ../../include/openssl/objects.h engine_lib.o: ../../include/openssl/opensslconf.h engine_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h engine_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h @@ -138,18 +139,19 @@ engine_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h engine_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h engine_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h engine_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h +engine_lib.o: engine_lib.c engine_list.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h engine_list.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h engine_list.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h engine_list.o: ../../include/openssl/crypto.h ../../include/openssl/des.h engine_list.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -engine_list.o: ../../include/openssl/e_os.h ../../include/openssl/e_os.h -engine_list.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h -engine_list.o: ../../include/openssl/err.h ../../include/openssl/evp.h -engine_list.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h -engine_list.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -engine_list.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h -engine_list.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +engine_list.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h +engine_list.o: ../../include/openssl/engine.h ../../include/openssl/err.h +engine_list.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +engine_list.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h +engine_list.o: ../../include/openssl/md4.h ../../include/openssl/md5.h +engine_list.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +engine_list.o: ../../include/openssl/objects.h engine_list.o: ../../include/openssl/opensslconf.h engine_list.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h engine_list.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h @@ -158,18 +160,19 @@ engine_list.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h engine_list.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h engine_list.o: ../../include/openssl/sha.h ../../include/openssl/stack.h engine_list.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h +engine_list.o: engine_list.c engine_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h engine_openssl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h engine_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h engine_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h engine_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h engine_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -engine_openssl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -engine_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h -engine_openssl.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -engine_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -engine_openssl.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -engine_openssl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +engine_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +engine_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h +engine_openssl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +engine_openssl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +engine_openssl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +engine_openssl.o: ../../include/openssl/obj_mac.h engine_openssl.o: ../../include/openssl/objects.h engine_openssl.o: ../../include/openssl/opensslconf.h engine_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h @@ -180,19 +183,19 @@ engine_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h engine_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h engine_openssl.o: ../../include/openssl/stack.h engine_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h +engine_openssl.o: engine_openssl.c hw_atalla.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h hw_atalla.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h hw_atalla.o: ../../include/openssl/crypto.h ../../include/openssl/des.h hw_atalla.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h hw_atalla.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -hw_atalla.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -hw_atalla.o: ../../include/openssl/engine.h ../../include/openssl/err.h -hw_atalla.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -hw_atalla.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -hw_atalla.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -hw_atalla.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h -hw_atalla.o: ../../include/openssl/objects.h +hw_atalla.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +hw_atalla.o: ../../include/openssl/err.h ../../include/openssl/evp.h +hw_atalla.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +hw_atalla.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +hw_atalla.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +hw_atalla.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h hw_atalla.o: ../../include/openssl/opensslconf.h hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h hw_atalla.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h @@ -201,20 +204,19 @@ hw_atalla.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h hw_atalla.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h hw_atalla.o: ../../include/openssl/sha.h ../../include/openssl/stack.h hw_atalla.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h -hw_atalla.o: vendor_defns/atalla.h +hw_atalla.o: hw_atalla.c vendor_defns/atalla.h hw_cswift.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h hw_cswift.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h hw_cswift.o: ../../include/openssl/crypto.h ../../include/openssl/des.h hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h hw_cswift.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -hw_cswift.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -hw_cswift.o: ../../include/openssl/engine.h ../../include/openssl/err.h -hw_cswift.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -hw_cswift.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -hw_cswift.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -hw_cswift.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h -hw_cswift.o: ../../include/openssl/objects.h +hw_cswift.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +hw_cswift.o: ../../include/openssl/err.h ../../include/openssl/evp.h +hw_cswift.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +hw_cswift.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +hw_cswift.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +hw_cswift.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h hw_cswift.o: ../../include/openssl/opensslconf.h hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h hw_cswift.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h @@ -223,20 +225,19 @@ hw_cswift.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h hw_cswift.o: ../../include/openssl/sha.h ../../include/openssl/stack.h hw_cswift.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h -hw_cswift.o: vendor_defns/cswift.h +hw_cswift.o: hw_cswift.c vendor_defns/cswift.h hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h hw_ncipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -hw_ncipher.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -hw_ncipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h -hw_ncipher.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -hw_ncipher.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -hw_ncipher.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -hw_ncipher.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h -hw_ncipher.o: ../../include/openssl/objects.h +hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h +hw_ncipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +hw_ncipher.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +hw_ncipher.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h hw_ncipher.o: ../../include/openssl/opensslconf.h hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h hw_ncipher.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h @@ -247,20 +248,21 @@ hw_ncipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h hw_ncipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h hw_ncipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -hw_ncipher.o: ../cryptlib.h engine_int.h vendor_defns/hwcryptohook.h +hw_ncipher.o: ../cryptlib.h engine_int.h hw_ncipher.c +hw_ncipher.o: vendor_defns/hwcryptohook.h hw_nuron.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h hw_nuron.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h hw_nuron.o: ../../include/openssl/crypto.h ../../include/openssl/des.h hw_nuron.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h hw_nuron.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -hw_nuron.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -hw_nuron.o: ../../include/openssl/engine.h ../../include/openssl/err.h -hw_nuron.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -hw_nuron.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -hw_nuron.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -hw_nuron.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h -hw_nuron.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +hw_nuron.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +hw_nuron.o: ../../include/openssl/err.h ../../include/openssl/evp.h +hw_nuron.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +hw_nuron.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +hw_nuron.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +hw_nuron.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +hw_nuron.o: ../../include/openssl/opensslconf.h hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h hw_nuron.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h hw_nuron.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h @@ -268,19 +270,20 @@ hw_nuron.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h hw_nuron.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h hw_nuron.o: ../../include/openssl/sha.h ../../include/openssl/stack.h hw_nuron.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h +hw_nuron.o: hw_nuron.c hw_ubsec.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h hw_ubsec.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h hw_ubsec.o: ../../include/openssl/crypto.h ../../include/openssl/des.h hw_ubsec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h hw_ubsec.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h -hw_ubsec.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h -hw_ubsec.o: ../../include/openssl/engine.h ../../include/openssl/err.h -hw_ubsec.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -hw_ubsec.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h -hw_ubsec.o: ../../include/openssl/md4.h ../../include/openssl/md5.h -hw_ubsec.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h -hw_ubsec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +hw_ubsec.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h +hw_ubsec.o: ../../include/openssl/err.h ../../include/openssl/evp.h +hw_ubsec.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h +hw_ubsec.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +hw_ubsec.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +hw_ubsec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +hw_ubsec.o: ../../include/openssl/opensslconf.h hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h hw_ubsec.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h hw_ubsec.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h @@ -288,4 +291,4 @@ hw_ubsec.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h hw_ubsec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h hw_ubsec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h hw_ubsec.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h -hw_ubsec.o: vendor_defns/hw_ubsec.h +hw_ubsec.o: hw_ubsec.c vendor_defns/hw_ubsec.h diff --git a/crypto/engine/engine_all.c b/crypto/engine/engine_all.c index 1d8acbf822..43da60483b 100644 --- a/crypto/engine/engine_all.c +++ b/crypto/engine/engine_all.c @@ -72,47 +72,47 @@ static int engine_add(ENGINE *e) void ENGINE_load_cswift(void) { -#ifndef NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_CSWIFT engine_add(ENGINE_cswift()); -#endif /* !NO_HW_CSWIFT */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW */ } void ENGINE_load_chil(void) { -#ifndef NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_CSWIFT engine_add(ENGINE_ncipher()); -#endif /* !NO_HW_CSWIFT */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW */ } void ENGINE_load_atalla(void) { -#ifndef NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_CSWIFT engine_add(ENGINE_atalla()); -#endif /* !NO_HW_CSWIFT */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW */ } void ENGINE_load_nuron(void) { -#ifndef NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_CSWIFT engine_add(ENGINE_nuron()); -#endif /* !NO_HW_CSWIFT */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW */ } void ENGINE_load_ubsec(void) { -#ifndef NO_HW -#ifndef NO_HW_UBSEC +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_UBSEC engine_add(ENGINE_ubsec()); -#endif /* !NO_HW_UBSEC */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_UBSEC */ +#endif /* !OPENSSL_NO_HW */ } void ENGINE_load_builtin_engines(void) diff --git a/crypto/engine/engine_err.c b/crypto/engine/engine_err.c index 29e8b6d458..a56858c88a 100644 --- a/crypto/engine/engine_err.c +++ b/crypto/engine/engine_err.c @@ -63,7 +63,7 @@ #include <openssl/engine.h> /* BEGIN ERROR CODES */ -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR static ERR_STRING_DATA ENGINE_str_functs[]= { {ERR_PACK(0,ENGINE_F_ATALLA_FINISH,0), "ATALLA_FINISH"}, @@ -186,7 +186,7 @@ void ERR_load_ENGINE_strings(void) if (init) { init=0; -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR ERR_load_strings(ERR_LIB_ENGINE,ENGINE_str_functs); ERR_load_strings(ERR_LIB_ENGINE,ENGINE_str_reasons); #endif diff --git a/crypto/engine/engine_int.h b/crypto/engine/engine_int.h index 52c23e54ed..67923cfd40 100644 --- a/crypto/engine/engine_int.h +++ b/crypto/engine/engine_int.h @@ -113,33 +113,33 @@ struct engine_st /* Returns a structure of software only methods (the default). */ ENGINE *ENGINE_openssl(); -#ifndef NO_HW +#ifndef OPENSSL_NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW_CSWIFT /* Returns a structure of cswift methods ... NB: This can exist and be * "used" even on non-cswift systems because the "init" will fail if the * card/library are not found. */ ENGINE *ENGINE_cswift(); -#endif /* !NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ -#ifndef NO_HW_NCIPHER +#ifndef OPENSSL_NO_HW_NCIPHER ENGINE *ENGINE_ncipher(); -#endif /* !NO_HW_NCIPHER */ +#endif /* !OPENSSL_NO_HW_NCIPHER */ -#ifndef NO_HW_ATALLA +#ifndef OPENSSL_NO_HW_ATALLA /* Returns a structure of atalla methods. */ ENGINE *ENGINE_atalla(); -#endif /* !NO_HW_ATALLA */ +#endif /* !OPENSSL_NO_HW_ATALLA */ -#ifndef NO_HW_NURON +#ifndef OPENSSL_NO_HW_NURON ENGINE *ENGINE_nuron(); -#endif /* !NO_HW_NURON */ +#endif /* !OPENSSL_NO_HW_NURON */ -#ifndef NO_HW_UBSEC +#ifndef OPENSSL_NO_HW_UBSEC ENGINE *ENGINE_ubsec(); -#endif /* !NO_HW_UBSEC */ +#endif /* !OPENSSL_NO_HW_UBSEC */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW */ #ifdef __cplusplus } diff --git a/crypto/engine/hw_atalla.c b/crypto/engine/hw_atalla.c index 4bea8e8cc1..9cd9bac5d3 100644 --- a/crypto/engine/hw_atalla.c +++ b/crypto/engine/hw_atalla.c @@ -63,8 +63,8 @@ #include "engine_int.h" #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_ATALLA +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_ATALLA #ifdef FLAT_INC #include "atalla.h" @@ -441,5 +441,5 @@ static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r, return atalla_mod_exp(r, a, p, m, ctx); } -#endif /* !NO_HW_ATALLA */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_ATALLA */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/hw_cswift.c b/crypto/engine/hw_cswift.c index ebb0ab0f77..582d74c72c 100644 --- a/crypto/engine/hw_cswift.c +++ b/crypto/engine/hw_cswift.c @@ -63,8 +63,8 @@ #include "engine_int.h" #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_CSWIFT +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_CSWIFT /* Attribution notice: Rainbow have generously allowed me to reproduce * the necessary definitions here from their API. This means the support @@ -804,5 +804,5 @@ static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r, return cswift_mod_exp(r, a, p, m, ctx); } -#endif /* !NO_HW_CSWIFT */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_CSWIFT */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c index 0057ca966c..98fd5227bc 100644 --- a/crypto/engine/hw_ncipher.c +++ b/crypto/engine/hw_ncipher.c @@ -65,8 +65,8 @@ #include "engine_int.h" #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_NCIPHER +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_NCIPHER /* Attribution notice: nCipher have said several times that it's OK for * us to implement a general interface to their boxes, and recently declared @@ -1016,5 +1016,5 @@ static void hwcrhk_log_message(void *logstr, const char *message) CRYPTO_w_unlock(CRYPTO_LOCK_BIO); } -#endif /* !NO_HW_NCIPHER */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_NCIPHER */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/hw_nuron.c b/crypto/engine/hw_nuron.c index 504febc1a1..5199a81305 100644 --- a/crypto/engine/hw_nuron.c +++ b/crypto/engine/hw_nuron.c @@ -64,8 +64,8 @@ #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_NURON +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_NURON typedef int tfnModExp(BIGNUM *r,const BIGNUM *a,const BIGNUM *p,const BIGNUM *m); static tfnModExp *pfnModExp = NULL; @@ -282,5 +282,5 @@ ENGINE *ENGINE_nuron() return &engine_nuron; } -#endif /* !NO_HW_NURON */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_NURON */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/hw_ubsec.c b/crypto/engine/hw_ubsec.c index 03b9ec5488..5168558121 100644 --- a/crypto/engine/hw_ubsec.c +++ b/crypto/engine/hw_ubsec.c @@ -65,8 +65,8 @@ #include "engine_int.h" #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_UBSEC +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_UBSEC #ifdef FLAT_INC #include "hw_ubsec.h" @@ -670,5 +670,5 @@ static int ubsec_rand_status(void) } #endif -#endif /* !NO_HW_UBSEC */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_UBSEC */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/vendor_defns/cswift.h b/crypto/engine/vendor_defns/cswift.h index 517d1a8500..60079326bb 100644 --- a/crypto/engine/vendor_defns/cswift.h +++ b/crypto/engine/vendor_defns/cswift.h @@ -32,12 +32,12 @@ typedef __uint32_t SW_U32; typedef unsigned long SW_U32; /* 32 bit integer */ #endif -#if defined(WIN32) +#if defined(OPENSSL_SYS_WIN32) typedef struct _SW_U64 { SW_U32 low32; SW_U32 high32; } SW_U64; /* 64 bit integer */ -#elif defined(MAC) +#elif defined(OPENSSL_SYS_MACINTOSH_CLASSIC) typedef longlong SW_U64 #else /* Unix variants */ typedef struct _SW_U64 { @@ -156,12 +156,12 @@ typedef struct _SW_LARGENUMBER { /* bytes in network (big endian) order */ } SW_LARGENUMBER; -#if defined(WIN32) +#if defined(OPENSSL_SYS_WIN32) #include <windows.h> typedef HANDLE SW_OSHANDLE; /* handle to kernel object */ #define SW_OS_INVALID_HANDLE INVALID_HANDLE_VALUE #define SW_CALLCONV _stdcall -#elif defined(MAC) +#elif defined(OPENSSL_SYS_MACINTOSH_CLASSIC) /* async callback mechanisms */ /* swiftCallbackLevel */ #define SW_MAC_CALLBACK_LEVEL_NO 0 |