From 665dc3924d4f7771dbe17b7518ce3c6d3694a352 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 11 Oct 2002 18:17:16 +0000 Subject: [PATCH] Step 7 of move of engines: Engines should not depend on private OpenSSL header files. --- engines/e_4758_cca.c | 3 +-- engines/e_4758_cca_err.c | 2 +- engines/e_aep.c | 2 +- engines/e_aep_err.c | 2 +- engines/e_atalla.c | 4 ++-- engines/e_atalla_err.c | 2 +- engines/e_cswift.c | 4 ++-- engines/e_cswift_err.c | 2 +- engines/e_ncipher.c | 3 +-- engines/e_ncipher_err.c | 2 +- engines/e_nuron.c | 4 ++-- engines/e_nuron_err.c | 2 +- engines/e_sureware.c | 5 +---- engines/e_sureware_err.c | 2 +- engines/e_ubsec.c | 4 ++-- engines/e_ubsec_err.c | 2 +- 16 files changed, 20 insertions(+), 25 deletions(-) diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c index b02989f336..2e77f8c647 100644 --- a/engines/e_4758_cca.c +++ b/engines/e_4758_cca.c @@ -56,7 +56,6 @@ #include #include /* #include */ -#include "cryptlib.h" #include #include #include @@ -71,7 +70,7 @@ #include "vendor_defns/hw_4758_cca.h" #endif -#include "hw_4758_cca_err.c" +#include "e_4758_cca_err.c" static int ibm_4758_cca_destroy(ENGINE *e); static int ibm_4758_cca_init(ENGINE *e); diff --git a/engines/e_4758_cca_err.c b/engines/e_4758_cca_err.c index 7ea5c63707..12c6d2eeda 100644 --- a/engines/e_4758_cca_err.c +++ b/engines/e_4758_cca_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_4758_cca_err.h" +#include "e_4758_cca_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_aep.c b/engines/e_aep.c index daea7e86e9..b01d7094f4 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -84,7 +84,7 @@ typedef int pid_t; #define AEP_LIB_NAME "aep engine" #define FAIL_TO_SW 0x10101010 -#include "hw_aep_err.c" +#include "e_aep_err.c" static int aep_init(ENGINE *e); static int aep_finish(ENGINE *e); diff --git a/engines/e_aep_err.c b/engines/e_aep_err.c index 092f532946..3a0e72463c 100644 --- a/engines/e_aep_err.c +++ b/engines/e_aep_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_aep_err.h" +#include "e_aep_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_atalla.c b/engines/e_atalla.c index 3f7494c707..be590f0ebb 100644 --- a/engines/e_atalla.c +++ b/engines/e_atalla.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include #include #include @@ -72,7 +72,7 @@ #endif #define ATALLA_LIB_NAME "atalla engine" -#include "hw_atalla_err.c" +#include "e_atalla_err.c" static int atalla_destroy(ENGINE *e); static int atalla_init(ENGINE *e); diff --git a/engines/e_atalla_err.c b/engines/e_atalla_err.c index 1df9c4570c..94f637a613 100644 --- a/engines/e_atalla_err.c +++ b/engines/e_atalla_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_atalla_err.h" +#include "e_atalla_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_cswift.c b/engines/e_cswift.c index a813227149..23d7919da0 100644 --- a/engines/e_cswift.c +++ b/engines/e_cswift.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include #include #include @@ -84,7 +84,7 @@ #endif #define CSWIFT_LIB_NAME "cswift engine" -#include "hw_cswift_err.c" +#include "e_cswift_err.c" static int cswift_destroy(ENGINE *e); static int cswift_init(ENGINE *e); diff --git a/engines/e_cswift_err.c b/engines/e_cswift_err.c index 684f53bf27..3c1111ba40 100644 --- a/engines/e_cswift_err.c +++ b/engines/e_cswift_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_cswift_err.h" +#include "e_cswift_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c index 614f9a1dde..f38a6a6b35 100644 --- a/engines/e_ncipher.c +++ b/engines/e_ncipher.c @@ -59,7 +59,6 @@ #include #include -#include "cryptlib.h" #include #include #include @@ -84,7 +83,7 @@ #endif #define HWCRHK_LIB_NAME "hwcrhk engine" -#include "hw_ncipher_err.c" +#include "e_ncipher_err.c" static int hwcrhk_destroy(ENGINE *e); static int hwcrhk_init(ENGINE *e); diff --git a/engines/e_ncipher_err.c b/engines/e_ncipher_err.c index 24024cfc6f..692435eee7 100644 --- a/engines/e_ncipher_err.c +++ b/engines/e_ncipher_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_ncipher_err.h" +#include "e_ncipher_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_nuron.c b/engines/e_nuron.c index c3a5327594..4585dbed1f 100644 --- a/engines/e_nuron.c +++ b/engines/e_nuron.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include #include #include @@ -67,7 +67,7 @@ #ifndef OPENSSL_NO_HW_NURON #define NURON_LIB_NAME "nuron engine" -#include "hw_nuron_err.c" +#include "e_nuron_err.c" static const char *NURON_LIBNAME = NULL; static const char *get_NURON_LIBNAME(void) diff --git a/engines/e_nuron_err.c b/engines/e_nuron_err.c index df9d7bde76..739529a1fa 100644 --- a/engines/e_nuron_err.c +++ b/engines/e_nuron_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_nuron_err.h" +#include "e_nuron_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_sureware.c b/engines/e_sureware.c index 89488b9e1b..dced97c695 100644 --- a/engines/e_sureware.c +++ b/engines/e_sureware.c @@ -51,12 +51,9 @@ ====================================================================*/ #include -#include "cryptlib.h" #include #include #include -#include "eng_int.h" -#include "engine.h" #include #ifndef OPENSSL_NO_HW @@ -69,7 +66,7 @@ #endif #define SUREWARE_LIB_NAME "sureware engine" -#include "hw_sureware_err.c" +#include "e_sureware_err.c" static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); static int surewarehk_destroy(ENGINE *e); diff --git a/engines/e_sureware_err.c b/engines/e_sureware_err.c index 69955dadbb..3ca03367b2 100644 --- a/engines/e_sureware_err.c +++ b/engines/e_sureware_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_sureware_err.h" +#include "e_sureware_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c index 7d077c7bc3..fe4a3b7ef7 100644 --- a/engines/e_ubsec.c +++ b/engines/e_ubsec.c @@ -60,7 +60,7 @@ #include #include -#include "cryptlib.h" +#include #include #include @@ -74,7 +74,7 @@ #endif #define UBSEC_LIB_NAME "ubsec engine" -#include "hw_ubsec_err.c" +#include "e_ubsec_err.c" #define FAIL_TO_SOFTWARE -15 diff --git a/engines/e_ubsec_err.c b/engines/e_ubsec_err.c index d707331fc2..5504116511 100644 --- a/engines/e_ubsec_err.c +++ b/engines/e_ubsec_err.c @@ -60,7 +60,7 @@ #include #include -#include "hw_ubsec_err.h" +#include "e_ubsec_err.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -- 2.25.1