Step 7 of move of engines: Engines should not depend on private
OpenSSL header files.
This commit is contained in:
parent
4bdacff25b
commit
665dc3924d
@ -56,7 +56,6 @@
|
||||
#include <stdio.h>
|
||||
#include <openssl/crypto.h>
|
||||
/* #include <openssl/pem.h> */
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/dso.h>
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/objects.h>
|
||||
@ -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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_4758_cca_err.h"
|
||||
#include "e_4758_cca_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_aep_err.h"
|
||||
#include "e_aep_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -58,7 +58,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/buffer.h>
|
||||
#include <openssl/dso.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
@ -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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_atalla_err.h"
|
||||
#include "e_atalla_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -58,7 +58,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/buffer.h>
|
||||
#include <openssl/dso.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
@ -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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_cswift_err.h"
|
||||
#include "e_cswift_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -59,7 +59,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/dso.h>
|
||||
@ -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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_ncipher_err.h"
|
||||
#include "e_ncipher_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -58,7 +58,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/buffer.h>
|
||||
#include <openssl/dso.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
@ -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)
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_nuron_err.h"
|
||||
#include "e_nuron_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -51,12 +51,9 @@
|
||||
====================================================================*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/dso.h>
|
||||
#include "eng_int.h"
|
||||
#include "engine.h"
|
||||
#include <openssl/engine.h>
|
||||
|
||||
#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);
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_sureware_err.h"
|
||||
#include "e_sureware_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/buffer.h>
|
||||
#include <openssl/dso.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
@ -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
|
||||
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/err.h>
|
||||
#include "hw_ubsec_err.h"
|
||||
#include "e_ubsec_err.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
Loading…
x
Reference in New Issue
Block a user