make update

diff --git a/TABLE b/TABLE
index e3b5eca31dc35bb6ca03ce56d23e0a45a3bf826e..fe4a3d5f982bce0e45065cf145ed0abc4fa0c300 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -266,7 +266,7 @@ $des_obj      =
 $aes_obj      = aes-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o
 $rmd160_obj   = 
@@ -709,12 +709,12 @@ $sys_id       = AIX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = 
-$bn_obj       = aix_ppc32.o
+$bn_obj       = aix_ppc32.o aix_ppc32-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_aix32.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -737,12 +737,12 @@ $sys_id       = AIX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = 
-$bn_obj       = aix_ppc32.o
+$bn_obj       = aix_ppc32.o aix_ppc32-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_aix32.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -793,12 +793,12 @@ $sys_id       = AIX
 $lflags       = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = 
-$bn_obj       = aix_ppc64.o
+$bn_obj       = aix_ppc64.o aix_ppc64-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_aix64.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -821,12 +821,12 @@ $sys_id       = AIX
 $lflags       = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = 
-$bn_obj       = aix_ppc64.o
+$bn_obj       = aix_ppc64.o aix_ppc64-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_aix64.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -868,6 +868,62 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
+*** beos-x86-bone
+$cc           = gcc
+$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = BEOS
+$lflags       = -lbe -lbind -lsocket
+$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   = beos
+$shared_target= beos-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -shared
+$shared_extension = .so
+$ranlib       = 
+$arflags      = 
+
+*** beos-x86-r5
+$cc           = gcc
+$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = BEOS
+$lflags       = -lbe -lnet
+$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   = beos
+$shared_target= beos-shared
+$shared_cflag = -fPIC -DPIC
+$shared_ldflag = -shared
+$shared_extension = .so
+$ranlib       = 
+$arflags      = 
+
 *** bsdi-elf-gcc
 $cc           = gcc
 $cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
@@ -1017,12 +1073,12 @@ $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
-$bn_obj       = osx_ppc32.o
+$bn_obj       = osx_ppc32.o osx_ppc32-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_osx32.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -1036,6 +1092,34 @@ $shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
 $ranlib       = 
 $arflags      = 
 
+*** darwin64-ppc-cc
+$cc           = cc
+$cflags       = -m64 -O3 -DB_ENDIAN
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = MACOSX
+$lflags       = -Wl,-search_paths_first
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
+$cpuid_obj    = 
+$bn_obj       = osx_ppc64.o osx_ppc64-mont.o
+$des_obj      = 
+$aes_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = sha1-ppc_osx64.o
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$dso_scheme   = dlfcn
+$shared_target= darwin-shared
+$shared_cflag = -fPIC -fno-common
+$shared_ldflag = -m64 -dynamiclib
+$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
+$ranlib       = 
+$arflags      = 
+
 *** debug
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror
@@ -1297,12 +1381,12 @@ $sys_id       = MACOSX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
-$bn_obj       = osx_ppc32.o
+$bn_obj       = osx_ppc32.o osx_ppc32-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_osx32.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -1710,7 +1794,7 @@ $arflags      =
 
 *** debug-steve
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe
+$cflags       = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
@@ -2893,12 +2977,12 @@ $sys_id       =
 $lflags       = -ldl
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = 
-$bn_obj       = linux_ppc32.o
+$bn_obj       = linux_ppc32.o linux_ppc32-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_linux32.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -2921,12 +3005,12 @@ $sys_id       =
 $lflags       = -ldl
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = 
-$bn_obj       = linux_ppc64.o
+$bn_obj       = linux_ppc64.o linux_ppc64-mont.o
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = 
+$sha1_obj     = sha1-ppc_linux64.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
@@ -3010,7 +3094,7 @@ $des_obj      =
 $aes_obj      = aes-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o
 $rmd160_obj   = 
@@ -3850,7 +3934,7 @@ $des_obj      =
 $aes_obj      = aes-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o
 $rmd160_obj   = 

diff --git a/apps/openssl-vms.cnf b/apps/openssl-vms.cnf
index c8e1a61a11abcf96291861590285ca482e028b8d..41318095f46d6d3ddc0b1c4a5c88c2e4950ab851 100644 (file)
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -72,7 +72,7 @@ cert_opt      = ca_default            # Certificate field options
 
 default_days   = 365                   # how long to certify for
 default_crl_days= 30                   # how long before next CRL
-default_md     = sha1                  # which md to use.
+default_md     = default               # use public key default MD
 preserve       = no                    # keep passed DN ordering
 
 # A few difference way of specifying how similar the request should look

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index faaf95b0a90993a80e35c61ad89c0ee3b1e5573a..7691d71a764918e502c01f0c5177e209b351f377 100644 (file)
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -244,7 +244,7 @@ a_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_sign.o: ../cryptlib.h a_sign.c
+a_sign.o: ../cryptlib.h a_sign.c asn1_locl.h
 a_strex.o: ../../e_os.h ../../include/openssl/asn1.h
 a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -312,6 +312,7 @@ a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c
+a_verify.o: asn1_locl.h
 ameth_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 ameth_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 ameth_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index ce9f585fd036fd322057cf30032a18c7497aee80..be89c9d8e219291b886bd403f3171f1b31333594 100644 (file)
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -121,3 +121,10 @@ obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 obj_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 obj_lib.o: ../cryptlib.h obj_lib.c
+obj_xref.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+obj_xref.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+obj_xref.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+obj_xref.o: ../../include/openssl/opensslconf.h
+obj_xref.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+obj_xref.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_xref.o: ../../include/openssl/symhacks.h obj_xref.c obj_xref.h

diff --git a/util/libeay.num b/util/libeay.num
index 1ba21f7d09ace05025c112825f0f30b93d279e70..e1c6e003eb92cbca5fe73e52ed4ba5cebd0c28c0 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3683,3 +3683,14 @@ EVP_PKEY_meth_set_paramgen              4078     EXIST::FUNCTION:
 EVP_PKEY_verify_recover                 4079   EXIST::FUNCTION:
 EVP_PKEY_asn1_set_ctrl                  4080   EXIST::FUNCTION:
 EVP_PKEY_CTX_new_id                     4081   EXIST::FUNCTION:
+EVP_PKEY_get_default_digest_nid         4082   EXIST::FUNCTION:
+OBJ_find_sigid_by_algs                  4083   EXIST::FUNCTION:
+PKCS7_RECIP_INFO_get0_alg               4084   EXIST::FUNCTION:
+EVP_PKEY_base_id                        4085   EXIST::FUNCTION:
+PKCS7_SIGNER_INFO_get0_algs             4086   EXIST::FUNCTION:
+EVP_PKEY_CTX_get0_pkey                  4087   EXIST::FUNCTION:
+EVP_PKEY_meth_add0                      4088   EXIST::FUNCTION:
+EVP_PKEY_meth_new                       4089   EXIST::FUNCTION:
+ASN1_STRING_set0                        4090   EXIST::FUNCTION:
+EVP_PKEY_id                             4091   EXIST::FUNCTION:
+OBJ_find_sigid_algs                     4092   EXIST::FUNCTION: