Another ENGINE that's been working in 0.9.6-engine for a while that will (b26f6ee5) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/engine/Makefile.ssl

+22 −2

Original line number	Diff line number	Diff line
		@@ -24,10 +24,10 @@ APPS=
		LIB=$(TOP)/libcrypto.a
		LIBSRC= engine_err.c engine_lib.c engine_list.c engine_openssl.c \
		hw_atalla.c hw_cswift.c hw_ncipher.c hw_aep.c hw_sureware.c \
		hw_ubsec.c
		hw_ubsec.c hw_keyclient.c
		LIBOBJ= engine_err.o engine_lib.o engine_list.o engine_openssl.o \
		hw_atalla.o hw_cswift.o hw_ncipher.o hw_aep.o hw_sureware.o \
		hw_ubsec.o
		hw_ubsec.o hw_keyclient.o

		SRC= $(LIBSRC)

		@@ -217,6 +217,26 @@ 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_keyclient.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		hw_keyclient.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		hw_keyclient.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		hw_keyclient.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
		hw_keyclient.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
		hw_keyclient.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
		hw_keyclient.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
		hw_keyclient.o: ../../include/openssl/err.h ../../include/openssl/evp.h
		hw_keyclient.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
		hw_keyclient.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
		hw_keyclient.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
		hw_keyclient.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
		hw_keyclient.o: ../../include/openssl/opensslconf.h
		hw_keyclient.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
		hw_keyclient.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
		hw_keyclient.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
		hw_keyclient.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
		hw_keyclient.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		hw_keyclient.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
		hw_keyclient.o: vendor_defns/keyclient.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

crypto/engine/engine.h

+26 −4

Original line number	Diff line number	Diff line
		@@ -276,9 +276,6 @@ int ENGINE_set_default_BN_mod_exp_crt(ENGINE *e);
		* ENGINE_METHOD_*** defines above. */
		int ENGINE_set_default(ENGINE *e, unsigned int flags);

		/* Obligatory error function. */
		void ERR_load_ENGINE_strings(void);

		/*
		* Error codes for all engine functions. NB: We use "generic"
		* function names instead of per-implementation ones because this
		@@ -293,6 +290,7 @@ void ERR_load_ENGINE_strings(void);
		/* 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.
		*/
		void ERR_load_ENGINE_strings(void);

		/* Error codes for the ENGINE functions. */

		@@ -362,6 +360,28 @@ void ERR_load_ENGINE_strings(void);
		#define ENGINE_F_HWCRHK_MOD_EXP_CRT 138
		#define ENGINE_F_HWCRHK_RAND_BYTES 139
		#define ENGINE_F_HWCRHK_RSA_MOD_EXP 140
		#define ENGINE_F_KC_INT_DSA_PRIV 213
		#define ENGINE_F_KC_INT_DSA_VERIFY 214
		#define ENGINE_F_KC_INT_RSA_PRIV 215
		#define ENGINE_F_KC_INT_RSA_PUB 216
		#define ENGINE_F_KEYCLIENT_CHECK_GLOBAL 217
		#define ENGINE_F_KEYCLIENT_DSA_FINISH 218
		#define ENGINE_F_KEYCLIENT_DSA_INIT 219
		#define ENGINE_F_KEYCLIENT_DSA_SIGN 220
		#define ENGINE_F_KEYCLIENT_DSA_VERIFY 221
		#define ENGINE_F_KEYCLIENT_FINISH 222
		#define ENGINE_F_KEYCLIENT_GET_DSA_CTX 223
		#define ENGINE_F_KEYCLIENT_GET_RSA_CTX 224
		#define ENGINE_F_KEYCLIENT_INIT 225
		#define ENGINE_F_KEYCLIENT_PADDING 226
		#define ENGINE_F_KEYCLIENT_RSA_FINISH 227
		#define ENGINE_F_KEYCLIENT_RSA_INIT 228
		#define ENGINE_F_KEYCLIENT_RSA_PRIV_DEC 229
		#define ENGINE_F_KEYCLIENT_RSA_PRIV_ENC 230
		#define ENGINE_F_KEYCLIENT_RSA_PUB_DEC 231
		#define ENGINE_F_KEYCLIENT_RSA_PUB_ENC 232
		#define ENGINE_F_KEYCLIENT_SET_DSA_CTX 233
		#define ENGINE_F_KEYCLIENT_SET_RSA_CTX 234
		#define ENGINE_F_LOG_MESSAGE 141
		#define ENGINE_F_SUREWAREHK_CTRL 209
		#define ENGINE_F_SUREWAREHK_DH_GEN_KEY 210
		@@ -406,6 +426,8 @@ void ERR_load_ENGINE_strings(void);
		#define ENGINE_R_ID_OR_NAME_MISSING 108
		#define ENGINE_R_INIT_FAILED 109
		#define ENGINE_R_INTERNAL_LIST_ERROR 110
		#define ENGINE_R_INVALID_PADDING 137
		#define ENGINE_R_KEY_TOO_LARGE 138
		#define ENGINE_R_MISSING_KEY_COMPONENTS 111
		#define ENGINE_R_MOD_EXP_CRT_FAILED 134
		#define ENGINE_R_MOD_EXP_FAILED 131
		@@ -413,6 +435,7 @@ void ERR_load_ENGINE_strings(void);
		#define ENGINE_R_NOT_LOADED 112
		#define ENGINE_R_NO_CALLBACK 127
		#define ENGINE_R_NO_CONTROL_FUNCTION 120
		#define ENGINE_R_NO_INDEX 139
		#define ENGINE_R_NO_KEY 124
		#define ENGINE_R_NO_LOAD_FUNCTION 125
		#define ENGINE_R_NO_REFERENCE 130
		@@ -430,4 +453,3 @@ void ERR_load_ENGINE_strings(void);
		}
		#endif
		#endif

crypto/engine/engine_err.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,28 @@ static ERR_STRING_DATA ENGINE_str_functs[]=
		{ERR_PACK(0,ENGINE_F_HWCRHK_MOD_EXP_CRT,0), "HWCRHK_MOD_EXP_CRT"},
		{ERR_PACK(0,ENGINE_F_HWCRHK_RAND_BYTES,0), "HWCRHK_RAND_BYTES"},
		{ERR_PACK(0,ENGINE_F_HWCRHK_RSA_MOD_EXP,0), "HWCRHK_RSA_MOD_EXP"},
		{ERR_PACK(0,ENGINE_F_KC_INT_DSA_PRIV,0), "KC_INT_DSA_PRIV"},
		{ERR_PACK(0,ENGINE_F_KC_INT_DSA_VERIFY,0), "KC_INT_DSA_VERIFY"},
		{ERR_PACK(0,ENGINE_F_KC_INT_RSA_PRIV,0), "KC_INT_RSA_PRIV"},
		{ERR_PACK(0,ENGINE_F_KC_INT_RSA_PUB,0), "KC_INT_RSA_PUB"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_CHECK_GLOBAL,0), "KEYCLIENT_CHECK_GLOBAL"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_DSA_FINISH,0), "KEYCLIENT_DSA_FINISH"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_DSA_INIT,0), "KEYCLIENT_DSA_INIT"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_DSA_SIGN,0), "KEYCLIENT_DSA_SIGN"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_DSA_VERIFY,0), "KEYCLIENT_DSA_VERIFY"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_FINISH,0), "KEYCLIENT_FINISH"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_GET_DSA_CTX,0), "KEYCLIENT_GET_DSA_CTX"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_GET_RSA_CTX,0), "KEYCLIENT_GET_RSA_CTX"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_INIT,0), "KEYCLIENT_INIT"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_PADDING,0), "KEYCLIENT_PADDING"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_FINISH,0), "KEYCLIENT_RSA_FINISH"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_INIT,0), "KEYCLIENT_RSA_INIT"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_PRIV_DEC,0), "KEYCLIENT_RSA_PRIV_DEC"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_PRIV_ENC,0), "KEYCLIENT_RSA_PRIV_ENC"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_PUB_DEC,0), "KEYCLIENT_RSA_PUB_DEC"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_RSA_PUB_ENC,0), "KEYCLIENT_RSA_PUB_ENC"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_SET_DSA_CTX,0), "KEYCLIENT_SET_DSA_CTX"},
		{ERR_PACK(0,ENGINE_F_KEYCLIENT_SET_RSA_CTX,0), "KEYCLIENT_SET_RSA_CTX"},
		{ERR_PACK(0,ENGINE_F_LOG_MESSAGE,0), "LOG_MESSAGE"},
		{ERR_PACK(0,ENGINE_F_SUREWAREHK_CTRL,0), "SUREWAREHK_CTRL"},
		{ERR_PACK(0,ENGINE_F_SUREWAREHK_DH_GEN_KEY,0), "SUREWAREHK_DH_GEN_KEY"},
		@@ -178,6 +200,8 @@ static ERR_STRING_DATA ENGINE_str_reasons[]=
		{ENGINE_R_ID_OR_NAME_MISSING ,"'id' or 'name' missing"},
		{ENGINE_R_INIT_FAILED ,"init failed"},
		{ENGINE_R_INTERNAL_LIST_ERROR ,"internal list error"},
		{ENGINE_R_INVALID_PADDING ,"invalid padding"},
		{ENGINE_R_KEY_TOO_LARGE ,"key too large"},
		{ENGINE_R_MISSING_KEY_COMPONENTS ,"missing key components"},
		{ENGINE_R_MOD_EXP_CRT_FAILED ,"mod exp crt failed"},
		{ENGINE_R_MOD_EXP_FAILED ,"mod exp failed"},
		@@ -185,6 +209,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]=
		{ENGINE_R_NOT_LOADED ,"not loaded"},
		{ENGINE_R_NO_CALLBACK ,"no callback"},
		{ENGINE_R_NO_CONTROL_FUNCTION ,"no control function"},
		{ENGINE_R_NO_INDEX ,"no index"},
		{ENGINE_R_NO_KEY ,"no key"},
		{ENGINE_R_NO_LOAD_FUNCTION ,"no load function"},
		{ENGINE_R_NO_REFERENCE ,"no reference"},

crypto/engine/engine_int.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,11 @@ ENGINE *ENGINE_sureware();
		/* Returns a structure of ubsec methods. */
		ENGINE *ENGINE_ubsec();
		#endif /* !NO_HW_UBSEC */

		#ifndef NO_HW_KEYCLIENT
		/* Returns a structure of keyclient methods. */
		ENGINE *ENGINE_keyclient();
		#endif /* !NO_HW_KEYCLIENT */
		#endif /* !NO_HW */

		#ifdef __cplusplus

crypto/engine/engine_list.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,10 @@ static int engine_internal_check(void)
		if(!engine_list_add(ENGINE_ubsec()))
		return 0;
		#endif /* !NO_HW_UBSEC */
		#ifndef NO_HW_KEYCLIENT
		if(!engine_list_add(ENGINE_keyclient()))
		return 0;
		#endif /* !NO_HW_KEYCLIENT */
		#endif /* !NO_HW */
		engine_list_flag = 1;
		return 1;