summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TABLE196
-rw-r--r--apps/Makefile50
-rw-r--r--crypto/dh/Makefile10
-rw-r--r--crypto/engine/Makefile15
-rw-r--r--crypto/evp/Makefile18
-rw-r--r--engines/Makefile7
-rw-r--r--ssl/Makefile4
-rw-r--r--test/Makefile9
-rwxr-xr-xutil/libeay.num1
-rwxr-xr-xutil/ssleay.num2
10 files changed, 220 insertions, 92 deletions
diff --git a/TABLE b/TABLE
index 6d58ceef37..7572a482d5 100644
--- a/TABLE
+++ b/TABLE
@@ -496,6 +496,68 @@ $ranlib =
$arflags =
$multilib =
+*** QNX6
+$cc = gcc
+$cflags = -DTERMIOS
+$unistd =
+$thread_cflag =
+$sys_id =
+$lflags = -lsocket
+$bn_ops =
+$cpuid_obj =
+$bn_obj =
+$des_obj =
+$aes_obj =
+$bf_obj =
+$md5_obj =
+$sha1_obj =
+$cast_obj =
+$rc4_obj =
+$rmd160_obj =
+$rc5_obj =
+$wp_obj =
+$cmll_obj =
+$perlasm_scheme = void
+$dso_scheme = dlfcn
+$shared_target= bsd-gcc-shared
+$shared_cflag = -fPIC
+$shared_ldflag =
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+$multilib =
+
+*** QNX6-i386
+$cc = gcc
+$cflags = -DL_ENDIAN -DTERMIOS -O2 -Wall
+$unistd =
+$thread_cflag =
+$sys_id =
+$lflags = -lsocket
+$bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$cpuid_obj = x86cpuid.o
+$bn_obj = bn-586.o co-586.o x86-mont.o
+$des_obj = des-586.o crypt586.o
+$aes_obj = aes-586.o aesni-x86.o
+$bf_obj = bf-586.o
+$md5_obj = md5-586.o
+$sha1_obj = sha1-586.o sha256-586.o sha512-586.o
+$cast_obj = cast-586.o
+$rc4_obj = rc4-586.o
+$rmd160_obj = rmd-586.o
+$rc5_obj = rc5-586.o
+$wp_obj = wp_block.o wp-mmx.o
+$cmll_obj = cmll-x86.o
+$perlasm_scheme = elf
+$dso_scheme = dlfcn
+$shared_target= bsd-gcc-shared
+$shared_cflag = -fPIC
+$shared_ldflag =
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+$multilib =
+
*** ReliantUNIX
$cc = cc
$cflags = -KPIC -g -DTERMIOS -DB_ENDIAN
@@ -653,7 +715,7 @@ $multilib =
*** VC-WIN32
$cc = cl
-$cflags = -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+$cflags = -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN32
@@ -684,7 +746,7 @@ $multilib =
*** VC-WIN64A
$cc = cl
-$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64A
@@ -715,7 +777,7 @@ $multilib =
*** VC-WIN64I
$cc = cl
-$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64I
@@ -1333,6 +1395,37 @@ $ranlib =
$arflags =
$multilib =
+*** debug-VC-WIN32
+$cc = cl
+$cflags = -W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
+$unistd =
+$thread_cflag =
+$sys_id = WIN32
+$lflags =
+$bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
+$cpuid_obj = x86cpuid.o
+$bn_obj = bn-586.o co-586.o x86-mont.o
+$des_obj = des-586.o crypt586.o
+$aes_obj = aes-586.o aesni-x86.o
+$bf_obj = bf-586.o
+$md5_obj = md5-586.o
+$sha1_obj = sha1-586.o sha256-586.o sha512-586.o
+$cast_obj = cast-586.o
+$rc4_obj = rc4-586.o
+$rmd160_obj = rmd-586.o
+$rc5_obj = rc5-586.o
+$wp_obj = wp_block.o wp-mmx.o
+$cmll_obj = cmll-x86.o
+$perlasm_scheme = win32n
+$dso_scheme = win32
+$shared_target=
+$shared_cflag =
+$shared_ldflag =
+$shared_extension =
+$ranlib =
+$arflags =
+$multilib =
+
*** debug-ben
$cc = gcc
$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe
@@ -2234,7 +2327,7 @@ $multilib =
*** debug-vos-gcc
$cc = gcc
-$cflags = -O0 -g -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
+$cflags = -O0 -g -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
$unistd =
$thread_cflag = (unknown)
$sys_id = VOS
@@ -4247,37 +4340,6 @@ $ranlib =
$arflags =
$multilib =
-*** qnx6
-$cc = cc
-$cflags = -DL_ENDIAN -DTERMIOS
-$unistd =
-$thread_cflag = (unknown)
-$sys_id =
-$lflags = -lsocket
-$bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj =
-$bn_obj =
-$des_obj =
-$aes_obj =
-$bf_obj =
-$md5_obj =
-$sha1_obj =
-$cast_obj =
-$rc4_obj =
-$rmd160_obj =
-$rc5_obj =
-$wp_obj =
-$cmll_obj =
-$perlasm_scheme =
-$dso_scheme =
-$shared_target=
-$shared_cflag =
-$shared_ldflag =
-$shared_extension =
-$ranlib =
-$arflags =
-$multilib =
-
*** rhapsody-ppc-cc
$cc = cc
$cflags = -O3 -DB_ENDIAN
@@ -4836,6 +4898,68 @@ $ranlib =
$arflags =
$multilib =
+*** uClinux-dist
+$cc =
+$cflags = $(CFLAGS)
+$unistd =
+$thread_cflag = -D_REENTRANT
+$sys_id =
+$lflags = $(LDFLAGS) $(LDLIBS)
+$bn_ops = BN_LLONG
+$cpuid_obj =
+$bn_obj =
+$des_obj =
+$aes_obj =
+$bf_obj =
+$md5_obj =
+$sha1_obj =
+$cast_obj =
+$rc4_obj =
+$rmd160_obj =
+$rc5_obj =
+$wp_obj =
+$cmll_obj =
+$perlasm_scheme =
+$dso_scheme =
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -shared
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+$multilib =
+
+*** uClinux-dist64
+$cc =
+$cflags = $(CFLAGS)
+$unistd =
+$thread_cflag = -D_REENTRANT
+$sys_id =
+$lflags = $(LDFLAGS) $(LDLIBS)
+$bn_ops = SIXTY_FOUR_BIT_LONG
+$cpuid_obj =
+$bn_obj =
+$des_obj =
+$aes_obj =
+$bf_obj =
+$md5_obj =
+$sha1_obj =
+$cast_obj =
+$rc4_obj =
+$rmd160_obj =
+$rc5_obj =
+$wp_obj =
+$cmll_obj =
+$perlasm_scheme =
+$dso_scheme =
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -shared
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+$multilib =
+
*** ultrix-cc
$cc = cc
$cflags = -std1 -O -Olimit 2500 -DL_ENDIAN
@@ -5024,7 +5148,7 @@ $multilib =
*** vos-gcc
$cc = gcc
-$cflags = -O3 -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -DB_ENDIAN
+$cflags = -O3 -Wall -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
$unistd =
$thread_cflag = (unknown)
$sys_id = VOS
diff --git a/apps/Makefile b/apps/Makefile
index 1718538c26..17330756a8 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -932,21 +932,20 @@ speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
speed.o: ../include/openssl/err.h ../include/openssl/evp.h
speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
-speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
-speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h
-speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
-speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
-speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h
-speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-speed.o: speed.c testdsa.h testrsa.h
+speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h
+speed.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
+speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
+speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
+speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+speed.o: ../include/openssl/seed.h ../include/openssl/sha.h
+speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
+speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h
+speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h
spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -1005,17 +1004,16 @@ version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
version.o: ../include/openssl/evp.h ../include/openssl/idea.h
-version.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-version.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-version.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h
-version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-version.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-version.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
-version.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-version.o: version.c
+version.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+version.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
+version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h
+version.o: ../include/openssl/sha.h ../include/openssl/stack.h
+version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+version.o: ../include/openssl/x509v3.h apps.h version.c
x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h
x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile
index eb1f0a12a9..f23b4f7fde 100644
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -164,11 +164,11 @@ dh_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
dh_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
dh_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
dh_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-dh_pmeth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dh_pmeth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_pmeth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dh_pmeth.o: ../cryptlib.h ../evp/evp_locl.h dh_pmeth.c
+dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dh_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h
+dh_pmeth.o: dh_pmeth.c
dh_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
dh_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
dh_prn.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 9ec46a87c3..bf86d52792 100644
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -84,6 +84,21 @@ clean:
# DO NOT DELETE THIS LINE -- make depend depends on it.
+eng_aesni.o: ../../e_os.h ../../include/openssl/aes.h
+eng_aesni.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+eng_aesni.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+eng_aesni.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+eng_aesni.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+eng_aesni.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_aesni.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+eng_aesni.o: ../../include/openssl/lhash.h ../../include/openssl/modes.h
+eng_aesni.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+eng_aesni.o: ../../include/openssl/opensslconf.h
+eng_aesni.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_aesni.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+eng_aesni.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+eng_aesni.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+eng_aesni.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_aesni.c
eng_all.o: ../../e_os.h ../../include/openssl/asn1.h
eng_all.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
eng_all.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 7e0a9286ee..4a92a138ea 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -437,19 +437,13 @@ m_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
m_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
m_ecdsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
m_ecdsa.o: ../cryptlib.h m_ecdsa.c
-m_md2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+m_md2.o: ../../e_os.h ../../include/openssl/bio.h
m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-m_md2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-m_md2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-m_md2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-m_md2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-m_md2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-m_md2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_md2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_md2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_md2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md2.c
+m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+m_md2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+m_md2.o: ../../include/openssl/symhacks.h ../cryptlib.h m_md2.c
m_md4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
m_md4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
m_md4.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/engines/Makefile b/engines/Makefile
index bd29bb485f..db06320d63 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -220,10 +220,9 @@ e_capi.o: ../include/openssl/evp.h ../include/openssl/lhash.h
e_capi.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
e_capi.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
e_capi.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-e_capi.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-e_capi.o: ../include/openssl/sha.h ../include/openssl/stack.h
-e_capi.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
-e_capi.o: ../include/openssl/x509_vfy.h e_capi.c
+e_capi.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+e_capi.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+e_capi.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_capi.c
e_chil.o: ../include/openssl/asn1.h ../include/openssl/bio.h
e_chil.o: ../include/openssl/bn.h ../include/openssl/buffer.h
e_chil.o: ../include/openssl/crypto.h ../include/openssl/dh.h
diff --git a/ssl/Makefile b/ssl/Makefile
index f897fba6b6..a97627c56d 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -163,7 +163,7 @@ d1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
d1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
d1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
d1_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_clnt.o: ../include/openssl/x509_vfy.h d1_clnt.c ssl_locl.h
+d1_clnt.o: ../include/openssl/x509_vfy.h d1_clnt.c kssl_lcl.h ssl_locl.h
d1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
d1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
d1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -280,7 +280,7 @@ kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-kssl.o: ../include/openssl/x509_vfy.h kssl.c
+kssl.o: ../include/openssl/x509_vfy.h kssl.c kssl_lcl.h
s23_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
s23_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
diff --git a/test/Makefile b/test/Makefile
index 75eb2d902d..54cd727fba 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -578,13 +578,8 @@ jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
jpaketest.o: ../include/openssl/symhacks.h jpaketest.c
-md2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-md2test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-md2test.o: ../include/openssl/evp.h ../include/openssl/md2.h
-md2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-md2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-md2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
-md2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md2test.c
+md2test.o: ../e_os.h ../include/openssl/e_os2.h
+md2test.o: ../include/openssl/opensslconf.h md2test.c
md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h
diff --git a/util/libeay.num b/util/libeay.num
index c4cfffae80..c5e89532cb 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4161,3 +4161,4 @@ X509_NAME_hash_old 4535 EXIST::FUNCTION:
ASN1_TIME_set_string 4536 EXIST::FUNCTION:
EVP_MD_flags 4537 EXIST::FUNCTION:
TS_RESP_CTX_free 4538 EXIST::FUNCTION:
+ENGINE_load_aesni 4539 EXIST::FUNCTION:ENGINE
diff --git a/util/ssleay.num b/util/ssleay.num
index 95b29efd2c..15a58e7b13 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -257,3 +257,5 @@ PEM_write_SSL_SESSION 305 EXIST:!WIN16:FUNCTION:
SSL_set_session_ticket_ext 306 EXIST::FUNCTION:
SSL_set_session_secret_cb 307 EXIST::FUNCTION:
SSL_set_session_ticket_ext_cb 308 EXIST::FUNCTION:
+SSL_set1_param 309 EXIST::FUNCTION:
+SSL_CTX_set1_param 310 EXIST::FUNCTION: