CRYPTO_128_unwrap(): Fix refactoring damage

[openssl.git] / TABLE

diff --git a/TABLE b/TABLE
index 397f83ed4513771514cc50f989c3a6f58670b028..f0e8b9b7f98f56cbf08d752fefaafc808af19613 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -3,13 +3,18 @@ Output of `Configure TABLE':
 *** BC-32
 $cc           = bcc32
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN32
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -35,14 +40,19 @@ $multilib     =
 
 *** BS2000-OSD
 $cc           = c89
-$cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DTERMIOS -DCHARSET_EBCDIC
+$cflags       = -O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -68,14 +78,19 @@ $multilib     =
 
 *** BSD-generic32
 $cc           = gcc
-$cflags       = -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -101,14 +116,19 @@ $multilib     =
 
 *** BSD-generic64
 $cc           = gcc
-$cflags       = -DTERMIOS -O3 -Wall
+$cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -134,14 +154,19 @@ $multilib     =
 
 *** BSD-ia64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -167,16 +192,21 @@ $multilib     =
 
 *** BSD-sparc64
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall
+$cflags       = -DB_ENDIAN -O3 -DMD32_REG_T=int -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -185,7 +215,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -200,14 +230,19 @@ $multilib     =
 
 *** BSD-sparcv8
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall
+$cflags       = -DB_ENDIAN -O3 -mv8 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
+$ec_obj       = 
 $des_obj      = des_enc-sparc.o fcrypt_b.o
 $aes_obj      = 
 $bf_obj       = 
@@ -233,14 +268,19 @@ $multilib     =
 
 *** BSD-x86
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -266,14 +306,19 @@ $multilib     =
 
 *** BSD-x86-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -g
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -299,26 +344,31 @@ $multilib     =
 
 *** BSD-x86_64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -333,13 +383,18 @@ $multilib     =
 *** Cygwin
 $cc           = gcc
 $cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
-$sys_id       = CYGWIN32
+$sys_id       = CYGWIN
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -363,49 +418,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** Cygwin-pre1.3
+*** Cygwin-x86_64
 $cc           = gcc
-$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall
+$cflags       = -DTERMIOS -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = CYGWIN32
+$thread_cflag = 
+$sys_id       = CYGWIN
 $lflags       = 
-$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
-$cpuid_obj    = 
-$bn_obj       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
-$rc4_obj      = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = mingw64
+$dso_scheme   = dlfcn
+$shared_target= cygwin-shared
+$shared_cflag = -D_WINDLL
+$shared_ldflag = -shared
+$shared_extension = .dll.a
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
 *** DJGPP
 $cc           = gcc
-$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
+$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MSDOS
 $lflags       = -L/dev/env/WATT_ROOT/lib -lwatt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -432,13 +497,18 @@ $multilib     =
 *** MPE/iX-gcc
 $cc           = gcc
 $cflags       = -D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = MPE
 $lflags       = -L/SYSLOG/PUB -lsyslog -lsocket -lcurses
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -465,13 +535,18 @@ $multilib     =
 *** OS2-EMX
 $cc           = gcc
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -498,13 +573,18 @@ $multilib     =
 *** OS390-Unix
 $cc           = c89.sh
 $cflags       = -O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -530,14 +610,19 @@ $multilib     =
 
 *** QNX6
 $cc           = gcc
-$cflags       = -DTERMIOS
+$cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -lsocket
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -563,14 +648,19 @@ $multilib     =
 
 *** QNX6-i386
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O2 -Wall
+$cflags       = -DL_ENDIAN -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -lsocket
+$debug_lflags   = 
+$release_lflags = 
 $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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -594,115 +684,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** ReliantUNIX
-$cc           = cc
-$cflags       = -KPIC -g -DTERMIOS -DB_ENDIAN
-$unistd       = 
-$thread_cflag = -Kthread
-$sys_id       = SNI
-$lflags       = -lsocket -lnsl -lc -L/usr/ucblib -lucb
-$bn_ops       = BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= reliantunix-shared
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** SINIX
-$cc           = cc
-$cflags       = -O
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = SNI
-$lflags       = -lsocket -lnsl -lc -L/usr/ucblib -lucb
-$bn_ops       = RC4_INDEX RC4_CHAR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** SINIX-N
-$cc           = /usr/ucb/cc
-$cflags       = -O2 -misaligned
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lucb
-$bn_ops       = RC4_INDEX RC4_CHAR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** UWIN
 $cc           = cc
 $cflags       = -DTERMIOS -DL_ENDIAN -O -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = UWIN
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -729,13 +725,18 @@ $multilib     =
 *** VC-CE
 $cc           = cl
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WINCE
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -761,14 +762,19 @@ $multilib     =
 
 *** VC-WIN32
 $cc           = cl
-$cflags       = -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
+$cflags       = -W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = -Zi
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN32
 $lflags       = 
+$debug_lflags   = 
+$release_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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -794,26 +800,31 @@ $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
+$cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = -Zi
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64A
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = auto
 $dso_scheme   = win32
@@ -827,14 +838,19 @@ $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
+$cflags       = -W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64I
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -861,25 +877,30 @@ $multilib     =
 *** aix-cc
 $cc           = cc
 $cflags       = -q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = -qthreaded
+$thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = aix32
 $dso_scheme   = dlfcn
@@ -894,25 +915,30 @@ $multilib     =
 *** aix-gcc
 $cc           = gcc
 $cflags       = -O -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = aix32
 $dso_scheme   = dlfcn
@@ -924,61 +950,33 @@ $ranlib       =
 $arflags      = -X32
 $multilib     = 
 
-*** aix3-cc
-$cc           = cc
-$cflags       = -O -DB_ENDIAN -qmaxmem=16384
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = AIX
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_CHAR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** aix64-cc
 $cc           = cc
 $cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = -qthreaded
+$thread_cflag = -qthreaded -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = aix64
 $dso_scheme   = dlfcn
@@ -993,25 +991,30 @@ $multilib     =
 *** aix64-gcc
 $cc           = gcc
 $cflags       = -maix64 -O -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = AIX
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = aix64
 $dso_scheme   = dlfcn
@@ -1026,13 +1029,18 @@ $multilib     =
 *** android
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1059,15 +1067,20 @@ $multilib     =
 *** android-armv7
 $cc           = gcc
 $cflags       = -march=armv7-a -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o armv4cpuid.o
 $bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-armv4.o
 $des_obj      = 
-$aes_obj      = aes_cbc.o aes-armv4.o
+$aes_obj      = aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o
 $bf_obj       = 
 $md5_obj      = 
 $sha1_obj     = sha1-armv4-large.o sha256-armv4.o sha512-armv4.o
@@ -1077,7 +1090,7 @@ $rmd160_obj   =
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = ghash-armv4.o
+$modes_obj    = ghash-armv4.o ghashv8-armx.o
 $engines_obj  = 
 $perlasm_scheme = void
 $dso_scheme   = dlfcn
@@ -1092,13 +1105,18 @@ $multilib     =
 *** android-mips
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -1125,13 +1143,18 @@ $multilib     =
 *** android-x86
 $cc           = gcc
 $cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -1155,115 +1178,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** aux3-gcc
-$cc           = gcc
-$cflags       = -O2 -DTERMIO
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = AUX
-$lflags       = -lbsd
-$bn_ops       = RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** 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.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = beos
-$shared_target= beos-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** 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.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = beos
-$shared_target= beos-shared
-$shared_cflag = -fPIC -DPIC
-$shared_ldflag = -shared
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** bsdi-elf-gcc
 $cc           = gcc
 $cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -1290,13 +1219,18 @@ $multilib     =
 *** cc
 $cc           = cc
 $cflags       = -O
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1320,82 +1254,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** cray-j90
+*** darwin-i386-cc
 $cc           = cc
-$cflags       = -DBIT_FIELD_LIMITS -DTERMIOS
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = CRAY
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG DES_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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** cray-t3e
-$cc           = cc
-$cflags       = -DBIT_FIELD_LIMITS -DTERMIOS
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = CRAY
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** darwin-i386-cc
-$cc           = cc
-$cflags       = -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN
+$cflags       = -arch i386 -DL_ENDIAN
+$debug_cflags   = -g3
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -1421,26 +1294,31 @@ $multilib     =
 
 *** darwin-ppc-cc
 $cc           = cc
-$cflags       = -arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL
+$cflags       = -arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = osx32
 $dso_scheme   = dlfcn
@@ -1452,28 +1330,71 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** darwin64-debug-test-64-clang
+$cc           = clang
+$cflags       = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
+$sys_id       = MACOSX
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = macosx
+$dso_scheme   = dlfcn
+$shared_target= darwin-shared
+$shared_cflag = -fPIC -fno-common
+$shared_ldflag = -arch x86_64 -dynamiclib
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** darwin64-ppc-cc
 $cc           = cc
 $cflags       = -arch ppc64 -O3 -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = osx64
 $dso_scheme   = dlfcn
@@ -1487,26 +1408,31 @@ $multilib     =
 
 *** darwin64-x86_64-cc
 $cc           = cc
-$cflags       = -arch x86_64 -O3 -DL_ENDIAN -Wall
+$cflags       = -arch x86_64 -DL_ENDIAN -Wall
+$debug_cflags   = -ggdb -g2 -O0
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = macosx
 $dso_scheme   = dlfcn
@@ -1521,13 +1447,18 @@ $multilib     =
 *** 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
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lefence
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1551,148 +1482,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-BSD-x86-elf
-$cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -Wall -g
-$unistd       = 
-$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$bn_ops       = BN_LLONG 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 x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= bsd-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-Cygwin
-$cc           = gcc
-$cflags       = -DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror
-$unistd       = 
-$thread_cflag = 
-$sys_id       = CYGWIN32
-$lflags       = 
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL
-$shared_ldflag = -shared
-$shared_extension = .dll.a
-$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 x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = win32n
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-VC-WIN64A
-$cc           = cl
-$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-$unistd       = 
-$thread_cflag = 
-$sys_id       = WIN64A
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
-$cpuid_obj    = x86_64cpuid.o
-$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
-$des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
-$bf_obj       = 
-$md5_obj      = md5-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 rc4-md5-x86_64.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = wp-x86_64.o
-$cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
-$engines_obj  = e_padlock-x86_64.o
-$perlasm_scheme = auto
-$dso_scheme   = win32
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** debug-VC-WIN64I
 $cc           = cl
-$cflags       = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$cflags       = -W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = WIN64I
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = ia64.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -1718,14 +1522,19 @@ $multilib     =
 
 *** debug-ben
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1749,16 +1558,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** debug-ben-darwin64
+$cc           = cc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = MACOSX
+$lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = macosx
+$dso_scheme   = dlfcn
+$shared_target= darwin-shared
+$shared_cflag = -fPIC -fno-common
+$shared_ldflag = -arch x86_64 -dynamiclib
+$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** debug-ben-debug
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1782,51 +1634,175 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-ben-macos
-$cc           = cc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
+*** debug-ben-debug-64
+$cc           = gcc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = (unknown)
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
-$rc4_obj      = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = elf
+$dso_scheme   = dlfcn
+$shared_target= bsd-gcc-shared
+$shared_cflag = -fPIC
 $shared_ldflag = 
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
-*** debug-ben-no-opt
-$cc           = gcc
-$cflags       = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3
+*** debug-ben-debug-64-clang
+$cc           = clang
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = (unknown)
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
 $lflags       = 
-$bn_ops       = 
-$cpuid_obj    = 
-$bn_obj       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.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     = 
+
+*** debug-ben-debug-64-noopt
+$cc           = gcc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
+$sys_id       = 
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.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     = 
+
+*** debug-ben-macos
+$cc           = cc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = (unknown)
+$sys_id       = 
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = 
+$cpuid_obj    = 
+$bn_obj       = 
+$ec_obj       = 
+$des_obj      = 
+$aes_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = 
+$modes_obj    = 
+$engines_obj  = 
+$perlasm_scheme = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
+*** debug-ben-no-opt
+$cc           = gcc
+$cflags       =  -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = (unknown)
+$sys_id       = 
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = 
+$cpuid_obj    = 
+$bn_obj       = 
+$ec_obj       = 
+$des_obj      = 
+$aes_obj      = 
 $bf_obj       = 
 $md5_obj      = 
 $sha1_obj     = 
@@ -1851,13 +1827,18 @@ $multilib     =
 *** debug-ben-openbsd
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1884,13 +1865,18 @@ $multilib     =
 *** debug-ben-openbsd-debug
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1917,13 +1903,18 @@ $multilib     =
 *** debug-ben-strict
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -1949,26 +1940,31 @@ $multilib     =
 
 *** debug-bodo
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -1980,82 +1976,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 64
 
-*** debug-darwin-i386-cc
-$cc           = cc
-$cflags       = -arch i386 -g3 -DL_ENDIAN
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = -Wl,-search_paths_first%
-$bn_ops       = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = x86cpuid.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = macosx
-$dso_scheme   = dlfcn
-$shared_target= darwin-shared
-$shared_cflag = -fPIC -fno-common
-$shared_ldflag = -arch i386 -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-darwin-ppc-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O
+*** debug-erbridge
+$cc           = gcc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
-$sys_id       = MACOSX
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid.o ppccap.o
-$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$sys_id       = 
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
-$rc4_obj      = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = osx32
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = elf
 $dso_scheme   = dlfcn
-$shared_target= darwin-shared
+$shared_target= linux-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -dynamiclib
-$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
+$shared_ldflag = -m64
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = 
+$multilib     = 64
 
 *** debug-geoff32
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2082,13 +2055,18 @@ $multilib     =
 *** debug-geoff64
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2112,49 +2090,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-levitte-linux-elf
-$cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG 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 x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** debug-levitte-linux-elf-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -2180,14 +2130,19 @@ $multilib     =
 
 *** debug-levitte-linux-noasm
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2213,14 +2168,19 @@ $multilib     =
 
 *** debug-levitte-linux-noasm-extreme
 $cc           = gcc
-$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2244,16 +2204,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-elf
+*** debug-linux-elf-noefence
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = -lefence -ldl
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -2277,18 +2242,23 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-elf-noefence
+*** debug-linux-ia32-aes
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall
+$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$bn_obj       = bn-586.o co-586.o x86-mont.o
+$ec_obj       = 
 $des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
+$aes_obj      = aes_x86core.o aes_cbc.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
@@ -2297,7 +2267,7 @@ $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
+$cmll_obj     = 
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
 $perlasm_scheme = elf
@@ -2310,115 +2280,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-generic32
+*** debug-linux-pentium
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
+$des_obj      = des-586.o crypt586.o
+$aes_obj      = aes-586.o vpaes-x86.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
+$modes_obj    = ghash-x86.o
+$engines_obj  = e_padlock-x86.o
+$perlasm_scheme = elf
 $dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
+$shared_target= 
+$shared_cflag = 
 $shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$shared_extension = 
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-generic64
+*** debug-linux-ppro
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-ia32-aes
-$cc           = gcc
-$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = BN_LLONG 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_x86core.o aes_cbc.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     = 
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-linux-pentium
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -2442,16 +2356,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-ppro
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall
+*** debug-rse
+$cc           = cc
+$cflags       = -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = -D_REENTRANT
+$thread_cflag = (unknown)
 $sys_id       = 
-$lflags       = -ldl
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -2466,7 +2385,7 @@ $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
 $perlasm_scheme = elf
-$dso_scheme   = dlfcn
+$dso_scheme   = 
 $shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
@@ -2475,28 +2394,33 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-linux-x86_64
+*** debug-steve-opt
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -2506,18 +2430,23 @@ $shared_ldflag = -m64
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = 64
+$multilib     = 
 
-*** debug-rse
-$cc           = cc
-$cflags       = -DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall
+*** debug-steve32
+$cc           = gcc
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = (unknown)
+$thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = 
+$lflags       = -rdynamic -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -2532,169 +2461,42 @@ $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
 $perlasm_scheme = elf
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv8-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv8-gcc
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = sparcv8.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = 
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv9-cc
-$cc           = cc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-solaris-sparcv9-gcc
-$cc           = gcc
-$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = ULTRASPARC
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
-$bf_obj       = 
-$md5_obj      = md5-sparcv9.o
-$sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
 $dso_scheme   = dlfcn
-$shared_target= solaris-shared
+$shared_target= linux-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -shared
+$shared_ldflag = -m32
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
-*** debug-steve-opt
+*** debug-steve64
 $cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -2706,82 +2508,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** debug-steve32
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe
-$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.o
-$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -m32
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** debug-steve64
-$cc           = gcc
-$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g
+*** debug-test-64-clang
+$cc           = clang
+$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = -D_REENTRANT
+$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT
 $sys_id       = 
-$lflags       = -ldl
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
-$shared_target= linux-shared
+$shared_target= bsd-gcc-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -m64
+$shared_ldflag = 
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
-*** 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
+*** dist
+$cc           = cc
+$cflags       = -O
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = 
-$sys_id       = CYGWIN32
+$thread_cflag = (unknown)
+$sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2795,26 +2574,31 @@ $wp_obj       =
 $cmll_obj     = 
 $modes_obj    = 
 $engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = win32
-$shared_target= cygwin-shared
+$perlasm_scheme = 
+$dso_scheme   = 
+$shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
-$shared_extension = .dll
+$shared_extension = 
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
-*** debug-vos-gcc
+*** gcc
 $cc           = gcc
-$cflags       = -O0 -g -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
+$cflags       = -O3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
-$sys_id       = VOS
-$lflags       = -Wl,-map
+$sys_id       = 
+$lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -2828,243 +2612,12 @@ $wp_obj       =
 $cmll_obj     = 
 $modes_obj    = 
 $engines_obj  = 
-$perlasm_scheme = void
+$perlasm_scheme = 
 $dso_scheme   = 
 $shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
-$shared_extension = .so
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** dgux-R3-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$bn_ops       = RC4_INDEX DES_UNROLL
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** dgux-R4-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lnsl -lsocket
-$bn_ops       = RC4_INDEX DES_UNROLL
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** dgux-R4-x86-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -DL_ENDIAN
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lnsl -lsocket
-$bn_ops       = BN_LLONG 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 x86-gf2m.o
-$des_obj      = des-586.o crypt586.o
-$aes_obj      = aes-586.o vpaes-x86.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
-$modes_obj    = ghash-x86.o
-$engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** dist
-$cc           = cc
-$cflags       = -O
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** gcc
-$cc           = gcc
-$cflags       = -O3
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-cc
-$cc           = cc
-$cflags       = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = DES_PTR DES_UNROLL DES_RISC1
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-gcc
-$cc           = gcc
-$cflags       = -DB_ENDIAN -DBN_DIV2W -O3
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = DES_PTR DES_UNROLL DES_RISC1
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$shared_extension = 
 $ranlib       = 
 $arflags      = 
 $multilib     = 
@@ -3072,13 +2625,18 @@ $multilib     =
 *** hpux-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -3105,13 +2663,18 @@ $multilib     = /hpux32
 *** hpux-ia64-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -3123,193 +2686,33 @@ $rmd160_obj   =
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= hpux-shared
-$shared_cflag = -fpic
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /hpux32
-
-*** hpux-parisc-cc
-$cc           = cc
-$cflags       = +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-parisc-cc-o4
-$cc           = cc
-$cflags       = -Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldld
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-parisc-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** hpux-parisc1_1-cc
-$cc           = cc
-$cflags       = +DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
-$cpuid_obj    = pariscid.o
-$bn_obj       = bn_asm.o parisc-mont.o
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
-$engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
-$shared_target= hpux-shared
-$shared_cflag = +Z
-$shared_ldflag = -b
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = /pa1.1
-
-*** hpux-parisc1_1-gcc
-$cc           = gcc
-$cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -Wl,+s -ldld
-$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
-$cpuid_obj    = pariscid.o
-$bn_obj       = bn_asm.o parisc-mont.o
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-parisc.o sha256-parisc.o sha512-parisc.o
-$cast_obj     = 
-$rc4_obj      = rc4-parisc.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-parisc.o
+$modes_obj    = ghash-ia64.o
 $engines_obj  = 
-$perlasm_scheme = 32
-$dso_scheme   = dl
+$perlasm_scheme = void
+$dso_scheme   = dlfcn
 $shared_target= hpux-shared
-$shared_cflag = -fPIC
+$shared_cflag = -fpic
 $shared_ldflag = -shared
-$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = /pa1.1
+$multilib     = /hpux32
 
-*** hpux-parisc2-cc
+*** hpux-parisc1_1-cc
 $cc           = cc
-$cflags       = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
+$cflags       = +DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = 
+$thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
-$bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = pariscid.o
-$bn_obj       = pa-risc2.o parisc-mont.o
+$bn_obj       = bn_asm.o parisc-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
 $bf_obj       = 
@@ -3331,18 +2734,23 @@ $shared_ldflag = -b
 $shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = /pa20_32
+$multilib     = /pa1.1
 
-*** hpux-parisc2-gcc
+*** hpux-parisc1_1-gcc
 $cc           = gcc
-$cflags       = -march=2.0 -O3 -DB_ENDIAN -D_REENTRANT
+$cflags       = -O3 -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
-$thread_cflag = 
+$thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -Wl,+s -ldld
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
 $cpuid_obj    = pariscid.o
-$bn_obj       = pa-risc2.o parisc-mont.o
+$bn_obj       = bn_asm.o parisc-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
 $bf_obj       = 
@@ -3364,18 +2772,23 @@ $shared_ldflag = -shared
 $shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = /pa20_32
+$multilib     = /pa1.1
 
 *** hpux64-ia64-cc
 $cc           = cc
 $cflags       = -Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -3402,13 +2815,18 @@ $multilib     = /hpux64
 *** hpux64-ia64-gcc
 $cc           = gcc
 $cflags       = -mlp64 -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -3435,13 +2853,18 @@ $multilib     = /hpux64
 *** hpux64-parisc2-cc
 $cc           = cc
 $cflags       = +DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = pariscid.o
 $bn_obj       = pa-risc2W.o parisc-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-parisc.o
 $bf_obj       = 
@@ -3468,13 +2891,18 @@ $multilib     = /pa20_64
 *** hpux64-parisc2-gcc
 $cc           = gcc
 $cflags       = -O3 -DB_ENDIAN -D_REENTRANT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
 $cpuid_obj    = 
 $bn_obj       = pa-risc2W.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -3500,14 +2928,19 @@ $multilib     = /pa20_64
 
 *** hurd-x86
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -3531,16 +2964,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
+*** ios64-cross
+$cc           = cc
+$cflags       = -O3 -arch arm64 -mios-version-min=7.0.0 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = iOS
+$lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
+$bn_obj       = 
+$ec_obj       = 
+$des_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = 
+$modes_obj    = ghashv8-armx.o
+$engines_obj  = 
+$perlasm_scheme = ios64
+$dso_scheme   = dlfcn
+$shared_target= darwin-shared
+$shared_cflag = -fPIC -fno-common
+$shared_ldflag = -dynamiclib
+$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** iphoneos-cross
-$cc           = llvm-gcc
+$cc           = cc
 $cflags       = -O3 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fomit-frame-pointer -fno-common
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = iOS
 $lflags       = -Wl,-search_paths_first%
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -3566,14 +3042,19 @@ $multilib     =
 
 *** irix-cc
 $cc           = cc
-$cflags       = -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN
+$cflags       = -O2 -use_readonly_const -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3599,14 +3080,19 @@ $multilib     =
 
 *** irix-gcc
 $cc           = gcc
-$cflags       = -O3 -DTERMIOS -DB_ENDIAN
+$cflags       = -O3 -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3632,14 +3118,19 @@ $multilib     =
 
 *** irix-mips3-cc
 $cc           = cc
-$cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3665,14 +3156,19 @@ $multilib     = 32
 
 *** irix-mips3-gcc
 $cc           = gcc
-$cflags       = -mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3698,14 +3194,19 @@ $multilib     = 32
 
 *** irix64-mips4-cc
 $cc           = cc
-$cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3731,14 +3232,19 @@ $multilib     = 64
 
 *** irix64-mips4-gcc
 $cc           = gcc
-$cflags       = -mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W
+$cflags       = -mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_SGI_MP_SOURCE
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -3762,63 +3268,35 @@ $ranlib       =
 $arflags      = 
 $multilib     = 64
 
-*** linux-alpha+bwx-ccc
-$cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-alpha+bwx-gcc
+*** levitte-linux-elf
 $cc           = gcc
-$cflags       = -O3 -DL_ENDIAN -DTERMIO
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
-$des_obj      = 
-$aes_obj      = 
-$bf_obj       = 
-$md5_obj      = 
-$sha1_obj     = sha1-alpha.o
-$cast_obj     = 
-$rc4_obj      = 
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-alpha.o
-$engines_obj  = 
-$perlasm_scheme = void
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
+$des_obj      = des-586.o crypt586.o
+$aes_obj      = aes-586.o vpaes-x86.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
+$modes_obj    = ghash-x86.o
+$engines_obj  = e_padlock-x86.o
+$perlasm_scheme = elf
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
@@ -3828,49 +3306,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** linux-alpha-ccc
-$cc           = ccc
-$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO
+*** linux-aarch64
+$cc           = gcc
+$cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = 
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL
-$cpuid_obj    = alphacpuid.o
-$bn_obj       = bn_asm.o alpha-mont.o
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$cpuid_obj    = armcap.o arm64cpuid.o mem_clr.o
+$bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aesv8-armx.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-alpha.o
+$sha1_obj     = sha1-armv8.o sha256-armv8.o sha512-armv8.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = ghash-alpha.o
+$modes_obj    = ghashv8-armx.o
 $engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
+$perlasm_scheme = linux64
+$dso_scheme   = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
 $shared_ldflag = 
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 $multilib     = 
 
 *** linux-alpha-gcc
 $cc           = gcc
-$cflags       = -O3 -DL_ENDIAN -DTERMIO
+$cflags       = -O3 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -3896,14 +3384,19 @@ $multilib     =
 
 *** linux-aout
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall
+$cflags       = -DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -3929,16 +3422,21 @@ $multilib     =
 
 *** linux-armv4
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -Wall
+$cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = armcap.o armv4cpuid.o
 $bn_obj       = bn_asm.o armv4-mont.o armv4-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-armv4.o
 $des_obj      = 
-$aes_obj      = aes_cbc.o aes-armv4.o
+$aes_obj      = aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o
 $bf_obj       = 
 $md5_obj      = 
 $sha1_obj     = sha1-armv4-large.o sha256-armv4.o sha512-armv4.o
@@ -3948,7 +3446,7 @@ $rmd160_obj   =
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = ghash-armv4.o
+$modes_obj    = ghash-armv4.o ghashv8-armx.o
 $engines_obj  = 
 $perlasm_scheme = void
 $dso_scheme   = dlfcn
@@ -3962,21 +3460,26 @@ $multilib     =
 
 *** linux-c64xplus
 $cc           = cl6x
-$cflags       = --linux --strip_coff_underscore -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT
+$cflags       = --linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = c64xpluscpuid.o
 $bn_obj       = bn-c64xplus.o c64xplus-gf2m.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes-c64xplus.o aes_cbc.o aes_ctr.o
 $bf_obj       = 
 $md5_obj      = 
 $sha1_obj     = sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o
 $cast_obj     = 
-$rc4_obj      = 
+$rc4_obj      = rc4-c64xplus.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
@@ -3995,14 +3498,19 @@ $multilib     =
 
 *** linux-elf
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -DL_ENDIAN -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = -lefence
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -4028,14 +3536,19 @@ $multilib     =
 
 *** linux-generic32
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4061,14 +3574,19 @@ $multilib     =
 
 *** linux-generic64
 $cc           = gcc
-$cflags       = -DTERMIO -O3 -Wall
+$cflags       = -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4094,14 +3612,19 @@ $multilib     =
 
 *** linux-ia32-icc
 $cc           = icc
-$cflags       = -DL_ENDIAN -DTERMIO -O2 -no_cpprt
+$cflags       = -DL_ENDIAN -O2
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = -ldl
+$lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -4127,47 +3650,19 @@ $multilib     =
 
 *** linux-ia64
 $cc           = gcc
-$cflags       = -DL_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
-$des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
-$bf_obj       = 
-$md5_obj      = md5-ia64.o
-$sha1_obj     = sha1-ia64.o sha256-ia64.o sha512-ia64.o
-$cast_obj     = 
-$rc4_obj      = rc4-ia64.o rc4_skey.o
-$rmd160_obj   = 
-$rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-ia64.o
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= linux-shared
-$shared_cflag = -fPIC
-$shared_ldflag = 
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** linux-ia64-ecc
-$cc           = ecc
-$cflags       = -DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
-$cpuid_obj    = ia64cpuid.o
-$bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -4193,14 +3688,19 @@ $multilib     =
 
 *** linux-ia64-icc
 $cc           = icc
-$cflags       = -DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt
+$cflags       = -DL_ENDIAN -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = -ldl
+$lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT
 $cpuid_obj    = ia64cpuid.o
 $bn_obj       = bn-ia64.o ia64-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_core.o aes_cbc.o aes-ia64.o
 $bf_obj       = 
@@ -4226,14 +3726,19 @@ $multilib     =
 
 *** linux-mips32
 $cc           = gcc
-$cflags       = -mabi=32 -DTERMIO -O3 -Wall
+$cflags       = -mabi=32 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -4259,14 +3764,19 @@ $multilib     =
 
 *** linux-mips64
 $cc           = gcc
-$cflags       = -mabi=n32 -DTERMIO -O3 -Wall
+$cflags       = -mabi=n32 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -4292,26 +3802,31 @@ $multilib     = 32
 
 *** linux-ppc
 $cc           = gcc
-$cflags       = -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = linux32
 $dso_scheme   = dlfcn
@@ -4325,26 +3840,31 @@ $multilib     =
 
 *** linux-ppc64
 $cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
 $cpuid_obj    = ppccpuid.o ppccap.o
 $bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
 $des_obj      = 
-$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$modes_obj    = 
+$modes_obj    = ghashp8-ppc.o
 $engines_obj  = 
 $perlasm_scheme = linux64
 $dso_scheme   = dlfcn
@@ -4356,16 +3876,59 @@ $ranlib       =
 $arflags      = 
 $multilib     = 64
 
+*** linux-ppc64le
+$cc           = gcc
+$cflags       = -m64 -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = 
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
+$cpuid_obj    = ppccpuid.o ppccap.o
+$bn_obj       = bn-ppc.o ppc-mont.o ppc64-mont.o
+$ec_obj       = 
+$des_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = 
+$modes_obj    = ghashp8-ppc.o
+$engines_obj  = 
+$perlasm_scheme = linux64le
+$dso_scheme   = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -m64
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
 *** linux-sparcv8
 $cc           = gcc
-$cflags       = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
+$cflags       = -mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
+$ec_obj       = 
 $des_obj      = des_enc-sparc.o fcrypt_b.o
 $aes_obj      = 
 $bf_obj       = 
@@ -4391,98 +3954,189 @@ $multilib     =
 
 *** linux-sparcv9
 $cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
+$cflags       = -m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
 $cast_obj     = 
-$rc4_obj      = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
+$modes_obj    = ghash-sparcv9.o
+$engines_obj  = 
+$perlasm_scheme = void
+$dso_scheme   = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -m32
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+$arflags      = 
+$multilib     = 
+
+*** linux-x32
+$cc           = gcc
+$cflags       = -mx32 -DL_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = 
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
+$rmd160_obj   = 
+$rc5_obj      = 
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = elf
+$dso_scheme   = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -mx32
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+$arflags      = 
+$multilib     = x32
+
+*** linux-x86_64
+$cc           = gcc
+$cflags       = -m64 -DL_ENDIAN -Wall
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g
+$release_cflags = -O3
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = 
+$lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj    = x86_64cpuid.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
+$des_obj      = 
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
+$bf_obj       = 
+$md5_obj      = md5-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
+$cast_obj     = 
+$rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
-$wp_obj       = 
-$cmll_obj     = 
-$modes_obj    = ghash-sparcv9.o
-$engines_obj  = 
-$perlasm_scheme = void
+$wp_obj       = wp-x86_64.o
+$cmll_obj     = cmll-x86_64.o cmll_misc.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
+$engines_obj  = e_padlock-x86_64.o
+$perlasm_scheme = elf
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -m32
+$shared_ldflag = -m64
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = 
+$multilib     = 64
 
-*** linux-x32
-$cc           = gcc
-$cflags       = -mx32 -DL_ENDIAN -DTERMIO -O3 -Wall
+*** linux-x86_64-clang
+$cc           = clang
+$cflags       = -m64 -DL_ENDIAN -O3 -Weverything -Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum -Qunused-arguments
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
-$bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL
+$debug_lflags   = 
+$release_lflags = 
+$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -mx32
+$shared_ldflag = -m64
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
-$multilib     = x32
+$multilib     = 64
 
-*** linux-x86_64
-$cc           = gcc
-$cflags       = -m64 -DL_ENDIAN -DTERMIO -O3 -Wall
+*** linux-x86_64-icc
+$cc           = icc
+$cflags       = -DL_ENDIAN -O2
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
-$lflags       = -ldl
+$lflags       = -ldl -no_cpprt
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
-$shared_ldflag = -m64
+$shared_ldflag = 
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
@@ -4490,14 +4144,19 @@ $multilib     = 64
 
 *** linux32-s390x
 $cc           = gcc
-$cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = s390xcap.o s390xcpuid.o
 $bn_obj       = bn_asm.o s390x-mont.o s390x-gf2m.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o
 $bf_obj       = 
@@ -4523,14 +4182,19 @@ $multilib     = /highgprs
 
 *** linux64-mips64
 $cc           = gcc
-$cflags       = -mabi=64 -DTERMIO -O3 -Wall
+$cflags       = -mabi=64 -O3 -Wall -DBN_DIV3W
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -4556,14 +4220,19 @@ $multilib     = 64
 
 *** linux64-s390x
 $cc           = gcc
-$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall
+$cflags       = -m64 -DB_ENDIAN -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = s390xcap.o s390xcpuid.o
 $bn_obj       = bn-s390x.o s390x-mont.o s390x-gf2m.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o
 $bf_obj       = 
@@ -4589,16 +4258,21 @@ $multilib     = 64
 
 *** linux64-sparcv9
 $cc           = gcc
-$cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
+$cflags       = -m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -4607,7 +4281,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -4623,13 +4297,18 @@ $multilib     = 64
 *** mingw
 $cc           = gcc
 $cflags       = -mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_MT
 $sys_id       = MINGW32
 $lflags       = -lws2_32 -lgdi32 -lcrypt32
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -4656,25 +4335,30 @@ $multilib     =
 *** mingw64
 $cc           = gcc
 $cflags       = -mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_MT
 $sys_id       = MINGW64
 $lflags       = -lws2_32 -lgdi32 -lcrypt32
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = mingw64
 $dso_scheme   = win32
@@ -4686,49 +4370,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** ncr-scde
-$cc           = cc
-$cflags       = -O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = -lsocket -lnsl -lc89
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** netware-clib
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4755,13 +4411,18 @@ $multilib     =
 *** netware-clib-bsdsock
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4787,14 +4448,19 @@ $multilib     =
 
 *** netware-clib-bsdsock-gcc
 $cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall
+$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4820,14 +4486,19 @@ $multilib     =
 
 *** netware-clib-gcc
 $cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall
+$cflags       = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4854,13 +4525,18 @@ $multilib     =
 *** netware-libc
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4887,13 +4563,18 @@ $multilib     =
 *** netware-libc-bsdsock
 $cc           = mwccnlm
 $cflags       = 
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4919,14 +4600,19 @@ $multilib     =
 
 *** netware-libc-bsdsock-gcc
 $cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall
+$cflags       = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -4952,47 +4638,19 @@ $multilib     =
 
 *** netware-libc-gcc
 $cc           = i586-netware-gcc
-$cflags       = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall
+$cflags       = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** newsos4-gcc
-$cc           = gcc
-$cflags       = -O -DB_ENDIAN
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = NEWS4
-$lflags       = -lmld -liberty
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5019,13 +4677,18 @@ $multilib     =
 *** nextstep
 $cc           = cc
 $cflags       = -O -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = <libc.h>
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5052,13 +4715,18 @@ $multilib     =
 *** nextstep3.3
 $cc           = cc
 $cflags       = -O3 -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = <libc.h>
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5085,13 +4753,18 @@ $multilib     =
 *** osf1-alpha-cc
 $cc           = cc
 $cflags       = -std1 -tune host -O4 -readonly_strings
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5118,13 +4791,18 @@ $multilib     =
 *** osf1-alpha-gcc
 $cc           = gcc
 $cflags       = -O3
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5151,13 +4829,18 @@ $multilib     =
 *** purify
 $cc           = purify gcc
 $cflags       = -g -DPURIFY -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5184,13 +4867,18 @@ $multilib     =
 *** qnx4
 $cc           = cc
 $cflags       = -DL_ENDIAN -DTERMIO
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5214,49 +4902,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** rhapsody-ppc-cc
-$cc           = cc
-$cflags       = -O3 -DB_ENDIAN
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = MACOSX_RHAPSODY
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** sco5-cc
 $cc           = cc
 $cflags       = -belf
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -5270,7 +4930,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -Kpic
@@ -5283,13 +4943,18 @@ $multilib     =
 *** sco5-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -5303,7 +4968,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -fPIC
@@ -5313,82 +4978,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = 
 
-*** solaris-sparcv7-cc
-$cc           = cc
-$cflags       = -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -KPIC
-$shared_ldflag = -G -dy -z text
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** solaris-sparcv7-gcc
-$cc           = gcc
-$cflags       = -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
-$unistd       = 
-$thread_cflag = -D_REENTRANT
-$sys_id       = 
-$lflags       = -lsocket -lnsl -ldl
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = dlfcn
-$shared_target= solaris-shared
-$shared_cflag = -fPIC
-$shared_ldflag = -shared
-$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** solaris-sparcv8-cc
 $cc           = cc
-$cflags       = -xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
+$cflags       = -xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
+$release_cflags = -xO5 -xdepend
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
+$ec_obj       = 
 $des_obj      = des_enc-sparc.o fcrypt_b.o
 $aes_obj      = 
 $bf_obj       = 
@@ -5414,14 +5018,19 @@ $multilib     =
 
 *** solaris-sparcv8-gcc
 $cc           = gcc
-$cflags       = -mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
+$cflags       = -mv8 -Wall -DB_ENDIAN
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g
+$release_cflags = -O3 -fomit-frame-pointer -DBN_DIV2W
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = sparcv8.o
+$ec_obj       = 
 $des_obj      = des_enc-sparc.o fcrypt_b.o
 $aes_obj      = 
 $bf_obj       = 
@@ -5447,16 +5056,21 @@ $multilib     =
 
 *** solaris-sparcv9-cc
 $cc           = cc
-$cflags       = -xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W
+$cflags       = -xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O
+$release_cflags = -xO5 -xdepend
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -5465,7 +5079,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -5480,16 +5094,21 @@ $multilib     =
 
 *** solaris-sparcv9-gcc
 $cc           = gcc
-$cflags       = -m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W
+$cflags       = -m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W
+$debug_cflags   = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__
+$release_cflags = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -5498,7 +5117,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -5513,14 +5132,19 @@ $multilib     =
 
 *** solaris-x86-cc
 $cc           = cc
-$cflags       = -fast -O -Xa
+$cflags       = -fast -xarch=generic -O -Xa
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5547,13 +5171,18 @@ $multilib     =
 *** solaris-x86-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -5580,15 +5209,20 @@ $multilib     =
 *** solaris64-sparcv9-cc
 $cc           = cc
 $cflags       = -xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -5597,7 +5231,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -5613,15 +5247,20 @@ $multilib     = /64
 *** solaris64-sparcv9-gcc
 $cc           = gcc
 $cflags       = -m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = ULTRASPARC
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
 $cpuid_obj    = sparcv9cap.o sparccpuid.o
-$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o
-$des_obj      = des_enc-sparc.o fcrypt_b.o
-$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o
+$bn_obj       = bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o
+$ec_obj       = 
+$des_obj      = des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o
+$aes_obj      = aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o
 $bf_obj       = 
 $md5_obj      = md5-sparcv9.o
 $sha1_obj     = sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o
@@ -5630,7 +5269,7 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
-$cmll_obj     = 
+$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o
 $modes_obj    = ghash-sparcv9.o
 $engines_obj  = 
 $perlasm_scheme = void
@@ -5646,25 +5285,30 @@ $multilib     = /64
 *** solaris64-x86_64-cc
 $cc           = cc
 $cflags       = -fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -5679,25 +5323,30 @@ $multilib     = /64
 *** solaris64-x86_64-gcc
 $cc           = gcc
 $cflags       = -m64 -O3 -Wall -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl -ldl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = x86_64cpuid.o
-$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o
+$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86_64.o
 $des_obj      = 
-$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o
+$aes_obj      = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
 $bf_obj       = 
 $md5_obj      = md5-x86_64.o
-$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
+$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
 $cast_obj     = 
 $rc4_obj      = rc4-x86_64.o rc4-md5-x86_64.o
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = wp-x86_64.o
 $cmll_obj     = cmll-x86_64.o cmll_misc.o
-$modes_obj    = ghash-x86_64.o
+$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o
 $engines_obj  = e_padlock-x86_64.o
 $perlasm_scheme = elf
 $dso_scheme   = dlfcn
@@ -5709,82 +5358,21 @@ $ranlib       =
 $arflags      = 
 $multilib     = /64
 
-*** sunos-gcc
-$cc           = gcc
-$cflags       = -O3 -mv8 -Dssize_t=int
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = SUNOS
-$lflags       = 
-$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = void
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
-*** tandem-c89
-$cc           = c89
-$cflags       = -Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN
-$unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = 
-$lflags       = 
-$bn_ops       = THIRTY_TWO_BIT
-$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     = 
-$modes_obj    = 
-$engines_obj  = 
-$perlasm_scheme = 
-$dso_scheme   = 
-$shared_target= 
-$shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
-$ranlib       = 
-$arflags      = 
-$multilib     = 
-
 *** tru64-alpha-cc
 $cc           = cc
 $cflags       = -std1 -tune host -fast -readonly_strings
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -pthread
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK
 $cpuid_obj    = alphacpuid.o
 $bn_obj       = bn_asm.o alpha-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5811,13 +5399,18 @@ $multilib     =
 *** uClinux-dist
 $cc           = 
 $cflags       = $(CFLAGS)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = $(LDFLAGS) $(LDLIBS)
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5844,13 +5437,18 @@ $multilib     =
 *** uClinux-dist64
 $cc           = 
 $cflags       = $(CFLAGS)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = $(LDFLAGS) $(LDLIBS)
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5877,13 +5475,18 @@ $multilib     =
 *** ultrix-cc
 $cc           = cc
 $cflags       = -std1 -O -Olimit 2500 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5910,13 +5513,18 @@ $multilib     =
 *** ultrix-gcc
 $cc           = gcc
 $cflags       = -O3 -DL_ENDIAN
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
 $lflags       = 
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5943,13 +5551,18 @@ $multilib     =
 *** unixware-2.0
 $cc           = cc
 $cflags       = -DFILIO_H -DNO_STRINGS_H
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl -lresolv -lx
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -5976,13 +5589,18 @@ $multilib     =
 *** unixware-2.1
 $cc           = cc
 $cflags       = -O -DFILIO_H
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl -lresolv -lx
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6009,13 +5627,18 @@ $multilib     =
 *** unixware-7
 $cc           = cc
 $cflags       = -O -DFILIO_H -Kalloca
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -Kthread
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
 $cpuid_obj    = x86cpuid.o
 $bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -6029,7 +5652,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr5-shared
 $shared_cflag = -Kpic
@@ -6042,13 +5665,18 @@ $multilib     =
 *** unixware-7-gcc
 $cc           = gcc
 $cflags       = -DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -lsocket -lnsl
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG 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 x86-gf2m.o
+$ec_obj       = ecp_nistz256.o ecp_nistz256-x86.o
 $des_obj      = des-586.o crypt586.o
 $aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o
 $bf_obj       = bf-586.o
@@ -6062,7 +5690,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= gnu-shared
 $shared_cflag = -fPIC
@@ -6074,14 +5702,19 @@ $multilib     =
 
 *** vos-gcc
 $cc           = gcc
-$cflags       = -O3 -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$cflags       = -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$debug_cflags   = -O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
+$release_cflags = -O3
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = VOS
 $lflags       = -Wl,-map
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = BN_LLONG
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6108,13 +5741,18 @@ $multilib     =
 *** vxworks-mips
 $cc           = ccmips
 $cflags       = -mrtp -mips2 -O -G 0 -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = bn-mips.o mips-mont.o
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-mips.o
 $bf_obj       = 
@@ -6141,13 +5779,18 @@ $multilib     =
 *** vxworks-ppc405
 $cc           = ccppc
 $cflags       = -g -msoft-float -mlongcall -DCPU=PPC405 -I$(WIND_BASE)/target/h
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6174,13 +5817,18 @@ $multilib     =
 *** vxworks-ppc60x
 $cc           = ccppc
 $cflags       = -D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/common
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6207,13 +5855,18 @@ $multilib     =
 *** vxworks-ppc750
 $cc           = ccppc
 $cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h $(DEBUG_FLAG)
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6240,13 +5893,18 @@ $multilib     =
 *** vxworks-ppc750-debug
 $cc           = ccppc
 $cflags       = -ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6273,13 +5931,18 @@ $multilib     =
 *** vxworks-ppc860
 $cc           = ccppc
 $cflags       = -nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I$(WIND_BASE)/target/h
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6306,13 +5969,18 @@ $multilib     =
 *** vxworks-ppcgen
 $cc           = ccppc
 $cflags       = -D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/usr/h/wrn/coreip
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       = 
@@ -6339,13 +6007,18 @@ $multilib     =
 *** vxworks-simlinux
 $cc           = ccpentium
 $cflags       = -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK
+$debug_cflags   = 
+$release_cflags = 
 $unistd       = 
 $thread_cflag = 
 $sys_id       = VXWORKS
 $lflags       = -r
+$debug_lflags   = 
+$release_lflags = 
 $bn_ops       = 
 $cpuid_obj    = 
 $bn_obj       = 
+$ec_obj       = 
 $des_obj      = 
 $aes_obj      = 
 $bf_obj       =