Fix error code. make update

diff --git a/TABLE b/TABLE
index fe4a3d5f982bce0e45065cf145ed0abc4fa0c300..2509d1838ee53e9048b6ce6f78b6421f1bbab1d5 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -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

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 8ef1b1b1a29b3c281503518cb03b79128d8eeb0a..11a3f82246bf808a450154629b2a11ffc37881df 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -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

diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index 62db507ce29d50415c20fe3d4bf6bd6882854798..8de1a4fb09d52222781f9e45caa33948c83ec6a6 100644 (file)
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -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}
        };

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 985b0a9f491e530146b61e3e87bdd62648315d9d..ef6a91f021612ca9b4bcfa5c7f81c8c87b87a546 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -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

diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index dfc7d0fab1225632684467254f2fb5c10ff1cd95..b99dea21903869b0e98cdfb629da57949a89603a 100644 (file)
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c
@@ -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;

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 850ab85fef97af778127d3bfdb31f85748a0279b..fb183b3d822b372b2c3dbb7eb6563a2ff642dabf 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -504,6 +504,19 @@ m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 m_sha1.o: ../cryptlib.h m_sha1.c
+m_sigver.o: ../../e_os.h ../../include/openssl/asn1.h
+m_sigver.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+m_sigver.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+m_sigver.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+m_sigver.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+m_sigver.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+m_sigver.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+m_sigver.o: ../../include/openssl/opensslconf.h
+m_sigver.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_sigver.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_sigver.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_sigver.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_sigver.c
 m_wp.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_wp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_wp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

diff --git a/util/libeay.num b/util/libeay.num
index 3cb68c7950957d85287a02a0c3e0660352c21b13..c307a26b214834f30ca1c1bdae99ce68f53a4669 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3647,7 +3647,8 @@ EVP_PKEY_asn1_get0                      4042      EXIST::FUNCTION:
 EVP_PKEY_paramgen_init                  4043   EXIST::FUNCTION:
 EVP_PKEY_sign                           4044   EXIST::FUNCTION:
 EVP_PKEY_meth_set_init                  4045   EXIST::FUNCTION:
-EVP_PKEY_meth_set_verify_recover        4046   EXIST::FUNCTION:
+EVP_PKEY_meth_set_verify_recover        4046   EXIST:!VMS:FUNCTION:
+EVP_PKEY_meth_set_vrfy_recover          4046   EXIST:VMS:FUNCTION:
 EVP_PKEY_CTX_set_cb                     4047   EXIST::FUNCTION:
 EVP_PKEY_meth_set_derive                4048   EXIST::FUNCTION:
 BUF_reverse                             4049   EXIST::FUNCTION:
@@ -3710,3 +3711,12 @@ EVP_DigestSignFinal                     4105     EXIST::FUNCTION:
 EVP_PKEY_CTX_dup                        4106   EXIST::FUNCTION:
 EVP_PKEY_meth_free                      4107   EXIST::FUNCTION:
 EVP_PKEY_meth_set_copy                  4108   EXIST::FUNCTION:
+ENGINE_register_pkey_meths              4109   EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_meth                    4110   EXIST::FUNCTION:ENGINE
+EVP_PKEY_CTX_set0_keygen_info           4111   EXIST::FUNCTION:
+ENGINE_get_pkey_meths                   4112   EXIST::FUNCTION:ENGINE
+ENGINE_register_all_pkey_meths          4113   EXIST::FUNCTION:ENGINE
+EVP_PKEY_CTX_get_cb                     4114   EXIST::FUNCTION:
+EVP_PKEY_CTX_get_operation              4115   EXIST::FUNCTION:
+ENGINE_unregister_pkey_meths            4116   EXIST::FUNCTION:ENGINE
+ENGINE_set_pkey_meths                   4117   EXIST::FUNCTION:ENGINE