Commit 73701c27 authored by Ben Laurie's avatar Ben Laurie
Browse files

First cut at Nuron mod-exp card support (untested, awaiting new libraries from 

Nuron).
parent 4ef897d1

crypto/engine/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 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_atalla.c hw_cswift.c hw_ncipher.c hw_nuron.c

LIBOBJ= engine_err.o engine_lib.o engine_list.o engine_openssl.o \

	hw_atalla.o hw_cswift.o hw_ncipher.o

	hw_atalla.o hw_cswift.o hw_ncipher.o hw_nuron.o



SRC= $(LIBSRC)

crypto/engine/engine.h

+5 −0
Original line number Diff line number Diff line
@@ -357,6 +357,9 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_F_HWCRHK_RAND_BYTES			 139

#define ENGINE_F_HWCRHK_RSA_MOD_EXP			 140

#define ENGINE_F_LOG_MESSAGE				 141

#define ENGINE_F_NURON_FINISH				 157

#define ENGINE_F_NURON_INIT				 156

#define ENGINE_F_NURON_MOD_EXP				 158



/* Reason codes. */

#define ENGINE_R_ALREADY_LOADED				 100
@@ -367,6 +370,8 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_R_CONFLICTING_ENGINE_ID			 103

#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED		 119

#define ENGINE_R_DSO_FAILURE				 104

#define ENGINE_R_DSO_FUNCTION_NOT_FOUND			 131

#define ENGINE_R_DSO_NOT_FOUND				 132

#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105

#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128

#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY		 129

crypto/engine/engine_err.c

+6 −1
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ static ERR_STRING_DATA ENGINE_str_functs[]= 
{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_LOG_MESSAGE,0),	"LOG_MESSAGE"},

{ERR_PACK(0,ENGINE_F_NURON_FINISH,0),	"NURON_FINISH"},

{ERR_PACK(0,ENGINE_F_NURON_INIT,0),	"NURON_INIT"},

{ERR_PACK(0,ENGINE_F_NURON_MOD_EXP,0),	"NURON_MOD_EXP"},

{0,NULL}

	};
@@ -139,6 +142,8 @@ static ERR_STRING_DATA ENGINE_str_reasons[]= 
{ENGINE_R_CONFLICTING_ENGINE_ID          ,"conflicting engine id"},

{ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},

{ENGINE_R_DSO_FAILURE                    ,"DSO failure"},

{ENGINE_R_DSO_FUNCTION_NOT_FOUND         ,"dso function not found"},

{ENGINE_R_DSO_NOT_FOUND                  ,"dso not found"},

{ENGINE_R_ENGINE_IS_NOT_IN_LIST          ,"engine is not in the list"},

{ENGINE_R_FAILED_LOADING_PRIVATE_KEY     ,"failed loading private key"},

{ENGINE_R_FAILED_LOADING_PUBLIC_KEY      ,"failed loading public key"},

crypto/engine/engine_int.h

+4 −0
Original line number Diff line number Diff line
@@ -151,6 +151,10 @@ ENGINE *ENGINE_ncipher(); 
ENGINE *ENGINE_atalla();

#endif /* !NO_HW_ATALLA */



#ifndef NO_HW_NURON

ENGINE *ENGINE_nuron();

#endif /* !NO_HW_NURON */



#endif /* !NO_HW */



#ifdef  __cplusplus

crypto/engine/engine_list.c

+4 −0
Original line number Diff line number Diff line
@@ -198,6 +198,10 @@ static int engine_internal_check(void) 
	if(!engine_list_add(ENGINE_atalla()))

		return 0;

#endif /* !NO_HW_ATALLA */

#ifndef NO_HW_NURON

	if(!engine_list_add(ENGINE_nuron()))

		return 0;

#endif /* !NO_HW_NURON */

#endif /* !NO_HW */

	engine_list_flag = 1;

	return 1;