Commit e0c1ea90 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix error code. make update

parent 6f88c6a6

TABLE

+28 −0
Original line number Diff line number Diff line
@@ -1848,6 +1848,34 @@ $shared_extension = 
$ranlib       = 

$arflags      = 



*** debug-steve-opt

$cc           = gcc

$cflags       = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe -O3

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -rdynamic -ldl

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$cpuid_obj    = x86cpuid-elf.o

$bn_obj       = bn86-elf.o co86-elf.o mo86-elf.o

$des_obj      = dx86-elf.o yx86-elf.o

$aes_obj      = ax86-elf.o

$bf_obj       = bx86-elf.o

$md5_obj      = mx86-elf.o

$sha1_obj     = sx86-elf.o s512sse2-elf.o

$cast_obj     = cx86-elf.o

$rc4_obj      = rx86-elf.o

$rmd160_obj   = rm86-elf.o

$rc5_obj      = r586-elf.o

$wp_obj       = wp_block.o w86mmx-elf.o

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 



*** debug-ulf

$cc           = gcc

$cflags       = -DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations

crypto/engine/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -262,6 +262,15 @@ tb_ecdsa.o: ../../include/openssl/opensslconf.h 
tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

tb_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

tb_ecdsa.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h tb_ecdsa.c

tb_pkmeth.o: ../../e_os.h ../../include/openssl/bio.h

tb_pkmeth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

tb_pkmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

tb_pkmeth.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

tb_pkmeth.o: ../../include/openssl/opensslconf.h

tb_pkmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

tb_pkmeth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

tb_pkmeth.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h

tb_pkmeth.o: tb_pkmeth.c

tb_rand.o: ../../e_os.h ../../include/openssl/bio.h

tb_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

crypto/engine/eng_err.c

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= 
{ERR_FUNC(ENGINE_F_ENGINE_GET_DEFAULT_TYPE),	"ENGINE_GET_DEFAULT_TYPE"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_DIGEST),	"ENGINE_get_digest"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_NEXT),	"ENGINE_get_next"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_METH),	"ENGINE_get_pkey_meth"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_PREV),	"ENGINE_get_prev"},

{ERR_FUNC(ENGINE_F_ENGINE_INIT),	"ENGINE_init"},

{ERR_FUNC(ENGINE_F_ENGINE_LIST_ADD),	"ENGINE_LIST_ADD"},
@@ -149,6 +150,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]= 
{ERR_REASON(ENGINE_R_RSA_NOT_IMPLEMENTED),"rsa not implemented"},

{ERR_REASON(ENGINE_R_UNIMPLEMENTED_CIPHER),"unimplemented cipher"},

{ERR_REASON(ENGINE_R_UNIMPLEMENTED_DIGEST),"unimplemented digest"},

{ERR_REASON(ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD),"unimplemented public key method"},

{ERR_REASON(ENGINE_R_VERSION_INCOMPATIBILITY),"version incompatibility"},

{0,NULL}

	};

crypto/engine/engine.h

+2 −0
Original line number Diff line number Diff line
@@ -724,6 +724,7 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177

#define ENGINE_F_ENGINE_GET_DIGEST			 186

#define ENGINE_F_ENGINE_GET_NEXT			 115

#define ENGINE_F_ENGINE_GET_PKEY_METH			 192

#define ENGINE_F_ENGINE_GET_PREV			 116

#define ENGINE_F_ENGINE_INIT				 119

#define ENGINE_F_ENGINE_LIST_ADD			 120
@@ -784,6 +785,7 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_R_RSA_NOT_IMPLEMENTED			 141

#define ENGINE_R_UNIMPLEMENTED_CIPHER			 146

#define ENGINE_R_UNIMPLEMENTED_DIGEST			 147

#define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD	 101

#define ENGINE_R_VERSION_INCOMPATIBILITY		 145



#ifdef  __cplusplus

crypto/engine/tb_pkmeth.c

+2 −2
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid) 
	ENGINE_PKEY_METHS_PTR fn = ENGINE_get_pkey_meths(e);

	if(!fn || !fn(e, &ret, NULL, nid))

		{

		ENGINEerr(ENGINE_F_ENGINE_GET_CIPHER,

				ENGINE_R_UNIMPLEMENTED_CIPHER);

		ENGINEerr(ENGINE_F_ENGINE_GET_PKEY_METH,

				ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD);

		return NULL;

		}

	return ret;