diff --git a/TABLE b/TABLE index 0dbd4736ffba329d11f5aad2a8507e0c262b262b..9660871578887b2a54794c8d071f617ed996d188 100644 --- a/TABLE +++ b/TABLE @@ -300,31 +300,6 @@ $shared_extension = $ranlib = $arflags = -*** Mingw32 -$cc = gcc -$cflags = -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -$unistd = -$thread_cflag = -$sys_id = -$lflags = -$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT -$bn_obj = -$des_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$dso_scheme = win32 -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = - *** NetBSD-m68 $cc = gcc $cflags = -DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN @@ -2018,7 +1993,7 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = dlfcn -$shared_target= +$shared_target= linux-shared $shared_cflag = $shared_ldflag = $shared_extension = @@ -2035,7 +2010,7 @@ $lflags = -rdynamic -ldl $bn_ops = SIXTY_FOUR_BIT $bn_obj = $des_obj = dlfcn -$bf_obj = +$bf_obj = linux-shared $md5_obj = $sha1_obj = $cast_obj = @@ -3075,6 +3050,31 @@ $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $ranlib = $arflags = +*** linux-ia64-ecc +$cc = ecc +$cflags = -DL_ENDIAN -DTERMIO -O2 -Wall +$unistd = +$thread_cflag = -D_REENTRANT +$sys_id = +$lflags = -ldl +$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR +$bn_obj = asm/ia64.o +$des_obj = +$bf_obj = +$md5_obj = +$sha1_obj = +$cast_obj = +$rc4_obj = +$rmd160_obj = +$rc5_obj = +$dso_scheme = dlfcn +$shared_target= linux-shared +$shared_cflag = -fPIC +$shared_ldflag = +$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) +$ranlib = +$arflags = + *** linux-k6 $cc = gcc $cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall @@ -3450,6 +3450,31 @@ $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $ranlib = $arflags = +*** mingw +$cc = gcc +$cflags = -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall +$unistd = +$thread_cflag = +$sys_id = MINGW32 +$lflags = -mno-cygwin -lwsock32 -lgdi32 +$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT +$bn_obj = asm/bn86-out.o asm/co86-out.o +$des_obj = asm/dx86-out.o asm/yx86-out.o +$bf_obj = asm/bx86-out.o +$md5_obj = asm/mx86-out.o +$sha1_obj = asm/sx86-out.o +$cast_obj = asm/cx86-out.o +$rc4_obj = asm/rx86-out.o +$rmd160_obj = asm/rm86-out.o +$rc5_obj = asm/r586-out.o +$dso_scheme = win32 +$shared_target= +$shared_cflag = +$shared_ldflag = +$shared_extension = .dll +$ranlib = +$arflags = + *** ncr-scde $cc = cc $cflags = -O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw diff --git a/crypto/ecdh/Makefile.ssl b/crypto/ecdh/Makefile.ssl index eb2e7605e88914e57a9924d06d391c5c93562fcc..7ab015070ec88782629a79e36b1bc79094fa3722 100644 --- a/crypto/ecdh/Makefile.ssl +++ b/crypto/ecdh/Makefile.ssl @@ -115,9 +115,10 @@ ech_lib.o: ech_lib.c ech_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ech_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h ech_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ech_ossl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ech_ossl.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h +ech_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/err.h +ech_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +ech_ossl.o: ../../include/openssl/opensslconf.h ech_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ech_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h ech_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_ossl.o: ecdh.h ech_ossl.c +ech_ossl.o: ech_ossl.c diff --git a/test/Makefile.ssl b/test/Makefile.ssl index 543789434ab2e97a8c89b8985335eb63aa6b9796..2b61e6f0070fda879f2617938c99ad44627be6dc 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -830,7 +830,8 @@ ecdhtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h ecdhtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h ecdhtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h ecdhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -ecdhtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ecdhtest.c +ecdhtest.o: ../include/openssl/sha.h ../include/openssl/stack.h +ecdhtest.o: ../include/openssl/symhacks.h ecdhtest.c ecdsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h ecdsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h ecdsatest.o: ../include/openssl/dh.h ../include/openssl/dsa.h diff --git a/util/libeay.num b/util/libeay.num index c03f58d64cafeeeaa25ea808fd9866a0b342f08f..243d9f12d99e922464c54ce04f058fdb19424947 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2905,7 +2905,7 @@ BN_nist_mod_224 3342 EXIST::FUNCTION: i2d_EC_PUBKEY_bio 3343 EXIST::FUNCTION:BIO,EC EC_GROUP_get_asn1_flag 3344 EXIST::FUNCTION:EC ECDH_get_ex_new_index 3345 EXIST::FUNCTION:ECDH -ECDH_size 3346 EXIST::FUNCTION:ECDH +ECDH_size 3346 NOEXIST::FUNCTION: BN_GF2m_mod_inv 3347 EXIST::FUNCTION: BN_GF2m_mod_exp 3348 EXIST::FUNCTION: EC_GROUP_get0_seed 3349 EXIST::FUNCTION:EC @@ -2999,3 +2999,4 @@ ENGINE_load_gmp 3433 EXIST::FUNCTION:ENGINE,STATIC_ENGIN a2i_IPADDRESS 3434 EXIST::FUNCTION: ENGINE_setup_bsd_cryptodev 3435 EXIST:__FreeBSD__:FUNCTION:ENGINE EC_GROUP_have_precompute_mult 3436 EXIST::FUNCTION:EC +X509V3_NAME_from_section 3437 EXIST::FUNCTION: diff --git a/util/ssleay.num b/util/ssleay.num index 7c15d0f05a3c339356235d128a335460e3a712b2..865005ac6464529420084d1f7cfb32e4a330a802 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -217,3 +217,4 @@ SSL_CTX_set_msg_callback 266 EXIST::FUNCTION: SSL_set_msg_callback 267 EXIST::FUNCTION: SSL_set_tmp_ecdh_callback 268 EXIST::FUNCTION:ECDH SSL_CTX_set_tmp_ecdh_callback 269 EXIST::FUNCTION:ECDH +SSL_SESSION_get_id 270 EXIST::FUNCTION: