25 files changed, 358 insertions, 256 deletions

diff --git a/.gitignore b/.gitignore
index fb3efdf..cfa91cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,10 +56,12 @@ tests/arc4random_fork*
 tests/asn1evp*
 tests/asn1time*
 tests/bnaddsub*
+tests/bn_rand_interval*
 tests/cipher*
 tests/explicit_bzero*
 tests/freenull*
 tests/gost2814789t*
+tests/key_schedule*
 tests/mont*
 tests/rfc5280time*
 tests/ssl_versions*
@@ -74,6 +76,7 @@ tests/*.pem
 tests/testssl
 tests/*.txt
 tests/compat/*.c
+tests/x509name*
 !tests/optionstest.c
 !tests/*.test
 
@@ -126,6 +129,7 @@ include/openssl/*.h
 /apps/ocspcheck/*.c
 /apps/ocspcheck/ocspcheck*
 /apps/ocspcheck/compat/memmem.c
+/apps/ocspcheck/compat/inet_ntop.c
 
 /apps/nc/*.h
 /apps/nc/*.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 549849f..a1ca98b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         add_definitions(-D_BSD_SOURCE)
         add_definitions(-D_POSIX_SOURCE)
         add_definitions(-D_GNU_SOURCE)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "MINGW")
@@ -65,22 +66,26 @@ if(WIN32)
         set(BUILD_NC false)
 endif()
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wall -g")
+
 if(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
         if(CMAKE_C_COMPILER MATCHES "gcc")
-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99 -fno-strict-aliasing")
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fno-strict-aliasing")
                 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlp64")
         else()
-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 +DD64 +Otype_safety=off")
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} +DD64 +Otype_safety=off")
         endif()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT")
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99 -fno-strict-aliasing")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fno-strict-aliasing")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} nsl socket)
 endif()
 
 add_definitions(-DLIBRESSL_INTERNAL)
@@ -101,6 +106,7 @@ if(WIN32)
         add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
         add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
         add_definitions(-DCPPFLAGS -DOPENSSL_NO_SPEED -DNO_SYSLOG -DNO_CRYPT)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
 endif()
 
 if(MSVC)
@@ -254,6 +260,8 @@ if(ENABLE_ASM)
         if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF")
                 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)")
                         set(HOST_ASM_ELF_X86_64 true)
+                elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
+                        set(HOST_ASM_ELF_ARMV4 true)
                 elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386")
                         set(HOST_ASM_ELF_X86_64 true)
                 endif()
@@ -262,27 +270,11 @@ if(ENABLE_ASM)
         endif()
 endif()
 
-set(OPENSSL_LIBS tls ssl crypto)
-
-# Add additional required libs
-if(WIN32)
-        set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32)
-endif()
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        set(OPENSSL_LIBS ${OPENSSL_LIBS} pthread)
-endif()
-if(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-        set(OPENSSL_LIBS ${OPENSSL_LIBS} pthread)
-endif()
-if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-        set(OPENSSL_LIBS ${OPENSSL_LIBS} nsl socket)
-endif()
-
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         # Check if we need -lrt to get clock_gettime on Linux
         check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
         if (HAVE_CLOCK_GETTIME)
-                set(OPENSSL_LIBS ${OPENSSL_LIBS} rt)
+                set(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
         endif()
 else()
         # Otherwise, simply check if it exists
@@ -301,6 +293,8 @@ if(SIZEOF_TIME_T STREQUAL "4")
 endif()
 add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T})
 
+set(OPENSSL_LIBS tls ssl crypto ${PLATFORM_LIBS})
+
 add_subdirectory(crypto)
 add_subdirectory(ssl)
 if(LIBRESSL_APPS)
@@ -322,6 +316,7 @@ if(NOT MSVC)
         set(exec_prefix \${prefix})
         set(libdir      \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
         set(includedir  \${prefix}/include)
+        string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
         file(STRINGS    "VERSION" VERSION LIMIT_COUNT 1)
         file(GLOB       OPENSSL_PKGCONFIGS "*.pc.in")
         foreach(file ${OPENSSL_PKGCONFIGS})
diff --git a/ChangeLog b/ChangeLog
index 8bf6854..b21ba99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,75 @@ history is also available from Git.
 
 LibreSSL Portable Release Notes:
 
+2.8.2 - Stable release
+
+        * Added Wycheproof support for ECDH and ECDSA Web Crypto test vectors,
+          along with test harness fixes.
+
+        * Fixed memory leak in nc(1)
+
+2.8.1 - Test and compatibility improvements
+
+        * Added Wycheproof support for ECDH, RSASSA-PSS, AES-GCM,
+          AES-CMAC, AES-CCM, AES-CBC-PKCS5, DSA, ChaCha20-Poly1305, ECDSA, and
+          X25519 test vectors. Applied appropriate fixes for errors uncovered
+          by tests.
+
+        * Simplified key exchange signature generation and verification.
+
+        * Fixed a one-byte buffer overrun in callers of EVP_read_pw_string
+
+        * Converted more code paths to use CBB/CBS. All handshake messages are
+          now created by CBB.
+
+        * Fixed various memory leaks found by Coverity.
+
+        * Simplified session ticket parsing and handling, inspired by
+          BoringSSL.
+
+        * Modified signature of CRYPTO_mem_leaks_* to return -1. This function
+          is a no-op in LibreSSL, so this function returns an error to not
+          indicate the (non-)existence of memory leaks.
+
+        * SSL_copy_session_id, PEM_Sign, EVP_EncodeUpdate, BIO_set_cipher,
+          X509_OBJECT_up_ref_count now return an int for error handling,
+          matching OpenSSL.
+
+        * Converted a number of #defines into proper functions, matching
+          OpenSSL's ABI.
+
+        * Added X509_get0_serialNumber from OpenSSL.
+
+        * Removed EVP_PKEY2PKCS8_broken and PKCS8_set_broken, while adding
+          PKCS8_pkey_add1_attr_by_NID and PKCS8_pkey_get0_attrs, matching
+          OpenSSL.
+
+        * Removed broken pkcs8 formats from openssl(1).
+
+        * Converted more functions in public API to use const arguments.
+
+        * Stopped handing AES-GCM in ssl_cipher_get_evp, since they use the
+          EVP_AEAD interface.
+
+        * Stopped using composite EVP_CIPHER AEADs.
+
+        * Added timing-safe compares for checking results of signature
+          verification. There are no known attacks, this is just inexpensive
+          prudence.
+
+        * Correctly clear the current cipher state, when changing cipher state.
+          This fixed an issue where renegotiation of cipher suites would fail
+          when switched from AEAD to non-AEAD or vice-versa.
+          Issue reported by Bernard Spil.
+
+        * Added more cipher tests to appstest.sh, including all TLSv1.2
+          ciphers.
+
+        * Added RSA_meth_get_finish() RSA_meth_set1_name() from OpenSSL.
+
+        * Added new EVP_CIPHER_CTX_(get|set)_iv() API that allows the IV to be
+          retrieved and set with appropriate validation.
+
 2.8.0 - Bug fixes, security, and compatibility improvements
 
         * Extensive documentation updates and additional API history.
@@ -989,7 +1058,7 @@ LibreSSL Portable Release Notes:
 
         * Removed nonfunctional Netscape browser-hang workaround code.
 
-        * Simplfied and refactored SSL/DTLS handshake code.
+        * Simplified and refactored SSL/DTLS handshake code.
 
         * Added SHA256 Camellia cipher suites for TLS 1.2 from RFC 5932.
 
diff --git a/apps/openssl/apps_win.c b/apps/openssl/apps_win.c
index 6d066c0..364c033 100644
--- a/apps/openssl/apps_win.c
+++ b/apps/openssl/apps_win.c
@@ -13,6 +13,20 @@
 #include "apps.h"
 
 double
+app_timer_real(int get)
+{
+        static __int64 start;
+        __int64 now;
+
+        now = GetTickCount64();
+        if (get) {
+                return (now - start) / 1000.0;
+        }
+        start = now;
+        return 0.0;
+}
+
+double
 app_timer_user(int stop)
 {
         static unsigned __int64 tmstart;
diff --git a/configure.ac b/configure.ac
index 16ed825..72a49b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,12 +80,12 @@ CFLAGS="$old_cflags"
 
 AS_CASE([$host_cpu],
         [*sparc*], [CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT"],
-        [*arm*], AS_IF([test "x$BSWAP4" = "xyes"],,
-                    CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT"),
+        [*arm*], [host_cpu=arm],
         [*amd64*], [host_cpu=x86_64 HOSTARCH=intel],
         [i?86], [HOSTARCH=intel],
         [x86_64], [HOSTARCH=intel]
 )
+AS_IF([test "x$BSWAP4" = "xyes" -a "$host_cpu" = "arm" ],,CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT")
 AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"])
 
 AC_MSG_CHECKING([if .gnu.warning accepts long strings])
@@ -105,6 +105,8 @@ AC_ARG_ENABLE([asm],
 AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
 
 # Conditionally enable assembly by default
+AM_CONDITIONAL([HOST_ASM_ELF_ARM],
+    [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
     [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index c394360..e84a0f2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,3 +1,28 @@
+if(HOST_ASM_ELF_ARMV4)
+        set(
+                ASM_ARMV4_ELF_SRC
+                aes/aes-elf-armv4.S
+                bn/gf2m-elf-armv4.S
+                bn/mont-elf-armv4.S
+                sha/sha1-elf-armv4.S
+                sha/sha512-elf-armv4.S
+                sha/sha256-elf-armv4.S
+                modes/ghash-elf-armv4.S
+                armv4cpuid.S
+                armcap.c
+        )
+        add_definitions(-DAES_ASM)
+        add_definitions(-DOPENSSL_BN_ASM_MONT)
+        add_definitions(-DOPENSSL_BN_ASM_GF2m)
+        add_definitions(-DGHASH_ASM)
+        add_definitions(-DSHA1_ASM)
+        add_definitions(-DSHA256_ASM)
+        add_definitions(-DSHA512_ASM)
+        add_definitions(-DOPENSSL_CPUID_OBJ)
+        set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
+        set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C)
+endif()
+
 if(HOST_ASM_ELF_X86_64)
         set(
                 ASM_X86_64_ELF_SRC
@@ -120,7 +145,6 @@ set(
         aes/aes_wrap.c
         asn1/a_bitstr.c
         asn1/a_bool.c
-        asn1/a_bytes.c
         asn1/a_d2i_fp.c
         asn1/a_digest.c
         asn1/a_dup.c
@@ -131,7 +155,6 @@ set(
         asn1/a_object.c
         asn1/a_octet.c
         asn1/a_print.c
-        asn1/a_set.c
         asn1/a_sign.c
         asn1/a_strex.c
         asn1/a_strnid.c
@@ -816,8 +839,8 @@ target_include_directories(crypto
 
 if (BUILD_SHARED_LIBS)
         export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
+        target_link_libraries(crypto ${PLATFORM_LIBS})
         if (WIN32)
-                target_link_libraries(crypto Ws2_32.lib)
                 set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
         endif()
         set_target_properties(crypto PROPERTIES
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 492a30e..e9f0f7a 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -192,9 +192,11 @@ include Makefile.am.arc4random
 libcrypto_la_SOURCES =
 EXTRA_libcrypto_la_SOURCES =
 
+include Makefile.am.elf-arm
 include Makefile.am.elf-x86_64
 include Makefile.am.macosx-x86_64
 
+if !HOST_ASM_ELF_ARM
 if !HOST_ASM_ELF_X86_64
 if !HOST_ASM_MACOSX_X86_64
 libcrypto_la_SOURCES += aes/aes_cbc.c
@@ -206,10 +208,16 @@ libcrypto_la_SOURCES += rc4/rc4_skey.c
 libcrypto_la_SOURCES += whrlpool/wp_block.c
 endif
 endif
+endif
 
 libcrypto_la_SOURCES += cpt_err.c
 libcrypto_la_SOURCES += cryptlib.c
 libcrypto_la_SOURCES += crypto_init.c
+if !HOST_WIN
+libcrypto_la_SOURCES += crypto_lock.c
+else
+libcrypto_la_SOURCES += crypto_lock_win.c
+endif
 libcrypto_la_SOURCES += cversion.c
 libcrypto_la_SOURCES += ex_data.c
 libcrypto_la_SOURCES += malloc-wrapper.c
@@ -237,7 +245,6 @@ noinst_HEADERS += aes/aes_locl.h
 # asn1
 libcrypto_la_SOURCES += asn1/a_bitstr.c
 libcrypto_la_SOURCES += asn1/a_bool.c
-libcrypto_la_SOURCES += asn1/a_bytes.c
 libcrypto_la_SOURCES += asn1/a_d2i_fp.c
 libcrypto_la_SOURCES += asn1/a_digest.c
 libcrypto_la_SOURCES += asn1/a_dup.c
@@ -248,7 +255,6 @@ libcrypto_la_SOURCES += asn1/a_mbstr.c
 libcrypto_la_SOURCES += asn1/a_object.c
 libcrypto_la_SOURCES += asn1/a_octet.c
 libcrypto_la_SOURCES += asn1/a_print.c
-libcrypto_la_SOURCES += asn1/a_set.c
 libcrypto_la_SOURCES += asn1/a_sign.c
 libcrypto_la_SOURCES += asn1/a_strex.c
 libcrypto_la_SOURCES += asn1/a_strnid.c
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm
new file mode 100644
index 0000000..a77c4d3
--- /dev/null
+++ b/crypto/Makefile.am.elf-arm
@@ -0,0 +1,30 @@
+ASM_ARM_ELF = aes/aes-elf-armv4.S
+ASM_ARM_ELF += bn/gf2m-elf-armv4.S
+ASM_ARM_ELF += bn/mont-elf-armv4.S
+ASM_ARM_ELF += sha/sha1-elf-armv4.S
+ASM_ARM_ELF += sha/sha512-elf-armv4.S
+ASM_ARM_ELF += sha/sha256-elf-armv4.S
+ASM_ARM_ELF += modes/ghash-elf-armv4.S
+ASM_ARM_ELF += armv4cpuid.S
+ASM_ARM_ELF += armcap.c
+
+ASM_ARM_ELF += aes/aes_cbc.c
+ASM_ARM_ELF += camellia/camellia.c
+ASM_ARM_ELF += camellia/cmll_cbc.c
+ASM_ARM_ELF += rc4/rc4_enc.c
+ASM_ARM_ELF += rc4/rc4_skey.c
+ASM_ARM_ELF += whrlpool/wp_block.c
+
+EXTRA_DIST += $(ASM_ARM_ELF)
+
+if HOST_ASM_ELF_ARM
+libcrypto_la_CPPFLAGS += -DAES_ASM
+libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m
+libcrypto_la_CPPFLAGS += -DGHASH_ASM
+libcrypto_la_CPPFLAGS += -DSHA1_ASM
+libcrypto_la_CPPFLAGS += -DSHA256_ASM
+libcrypto_la_CPPFLAGS += -DSHA512_ASM
+libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
+libcrypto_la_SOURCES += $(ASM_ARM_ELF)
+endif
diff --git a/crypto/compat/crypto_lock_win.c b/crypto/compat/crypto_lock_win.c
new file mode 100644
index 0000000..47c3dcc
--- /dev/null
+++ b/crypto/compat/crypto_lock_win.c
@@ -0,0 +1,53 @@
+/* $OpenBSD: crypto_lock.c,v 1.1 2018/11/11 06:41:28 bcook Exp $ */
+/*
+ * Copyright (c) 2018 Brent Cook <bcook@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <windows.h>
+
+static HANDLE locks[CRYPTO_NUM_LOCKS];
+
+void
+crypto_init_locks(void)
+{
+        int i;
+
+        for (i = 0; i < CRYPTO_NUM_LOCKS; i++)
+                locks[i] = CreateMutex(NULL, FALSE, NULL);
+}
+
+void
+CRYPTO_lock(int mode, int type, const char *file, int line)
+{
+        if (type < 0 || type >= CRYPTO_NUM_LOCKS)
+                return;
+
+        if (mode & CRYPTO_LOCK)
+                WaitForSingleObject(locks[type], INFINITE);
+        else
+                ReleaseMutex(locks[type]);
+}
+
+int
+CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
+    int line)
+{
+        int ret = 0;
+        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE, type, file, line);
+        ret = *pointer + amount;
+        *pointer = ret;
+        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE, type, file, line);
+        return (ret);
+}
diff --git a/include/compat/unistd.h b/include/compat/unistd.h
index e70a390..f521b94 100644
--- a/include/compat/unistd.h
+++ b/include/compat/unistd.h
@@ -62,6 +62,7 @@ int getpagesize(void);
 #endif
 
 #define pledge(request, paths) 0
+#define unveil(path, permissions) 0
 
 #ifndef HAVE_PIPE2
 int pipe2(int fildes[2], int flags);
diff --git a/man/links b/man/links
index 6498fb7..7f60d0e 100644
--- a/man/links
+++ b/man/links
@@ -790,6 +790,7 @@ EVP_EncryptInit.3,EVP_CIPHER_CTX_ctrl.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_flags.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_free.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_get_app_data.3
+EVP_EncryptInit.3,EVP_CIPHER_CTX_get_iv.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_init.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_iv_length.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_key_length.3
@@ -799,6 +800,7 @@ EVP_EncryptInit.3,EVP_CIPHER_CTX_nid.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_rand_key.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_reset.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_set_app_data.3
+EVP_EncryptInit.3,EVP_CIPHER_CTX_set_iv.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_set_key_length.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_set_padding.3
 EVP_EncryptInit.3,EVP_CIPHER_CTX_type.3
@@ -1290,6 +1292,8 @@ RSA_get_ex_new_index.3,RSA_get_ex_data.3
 RSA_get_ex_new_index.3,RSA_set_ex_data.3
 RSA_meth_new.3,RSA_meth_dup.3
 RSA_meth_new.3,RSA_meth_free.3
+RSA_meth_new.3,RSA_meth_get_finish.3
+RSA_meth_new.3,RSA_meth_set1_name.3
 RSA_meth_new.3,RSA_meth_set_finish.3
 RSA_meth_new.3,RSA_meth_set_priv_dec.3
 RSA_meth_new.3,RSA_meth_set_priv_enc.3
@@ -1982,6 +1986,8 @@ d2i_DSAPublicKey.3,d2i_DSA_PUBKEY_bio.3
 d2i_DSAPublicKey.3,d2i_DSA_PUBKEY_fp.3
 d2i_DSAPublicKey.3,d2i_DSA_SIG.3
 d2i_DSAPublicKey.3,d2i_DSAparams.3
+d2i_DSAPublicKey.3,d2i_DSAparams_bio.3
+d2i_DSAPublicKey.3,d2i_DSAparams_fp.3
 d2i_DSAPublicKey.3,i2d_DSAPrivateKey.3
 d2i_DSAPublicKey.3,i2d_DSAPrivateKey_bio.3
 d2i_DSAPublicKey.3,i2d_DSAPrivateKey_fp.3
@@ -1991,6 +1997,8 @@ d2i_DSAPublicKey.3,i2d_DSA_PUBKEY_bio.3
 d2i_DSAPublicKey.3,i2d_DSA_PUBKEY_fp.3
 d2i_DSAPublicKey.3,i2d_DSA_SIG.3
 d2i_DSAPublicKey.3,i2d_DSAparams.3
+d2i_DSAPublicKey.3,i2d_DSAparams_bio.3
+d2i_DSAPublicKey.3,i2d_DSAparams_fp.3
 d2i_ECPKParameters.3,ECPKParameters_print.3
 d2i_ECPKParameters.3,ECPKParameters_print_fp.3
 d2i_ECPKParameters.3,ECParameters_dup.3
@@ -2220,118 +2228,6 @@ d2i_X509_SIG.3,i2d_PKCS8_fp.3
 d2i_X509_SIG.3,i2d_X509_SIG.3
 des_read_pw.3,EVP_read_pw_string.3
 des_read_pw.3,des_read_pw_string.3
-engine.3,ENGINE_add.3
-engine.3,ENGINE_by_id.3
-engine.3,ENGINE_cleanup.3
-engine.3,ENGINE_cmd_is_executable.3
-engine.3,ENGINE_ctrl.3
-engine.3,ENGINE_ctrl_cmd.3
-engine.3,ENGINE_ctrl_cmd_string.3
-engine.3,ENGINE_finish.3
-engine.3,ENGINE_free.3
-engine.3,ENGINE_get_DH.3
-engine.3,ENGINE_get_DSA.3
-engine.3,ENGINE_get_ECDH.3
-engine.3,ENGINE_get_ECDSA.3
-engine.3,ENGINE_get_RAND.3
-engine.3,ENGINE_get_RSA.3
-engine.3,ENGINE_get_STORE.3
-engine.3,ENGINE_get_cipher.3
-engine.3,ENGINE_get_cipher_engine.3
-engine.3,ENGINE_get_ciphers.3
-engine.3,ENGINE_get_cmd_defns.3
-engine.3,ENGINE_get_ctrl_function.3
-engine.3,ENGINE_get_default_DH.3
-engine.3,ENGINE_get_default_DSA.3
-engine.3,ENGINE_get_default_ECDH.3
-engine.3,ENGINE_get_default_ECDSA.3
-engine.3,ENGINE_get_default_RAND.3
-engine.3,ENGINE_get_default_RSA.3
-engine.3,ENGINE_get_destroy_function.3
-engine.3,ENGINE_get_digest.3
-engine.3,ENGINE_get_digest_engine.3
-engine.3,ENGINE_get_digests.3
-engine.3,ENGINE_get_finish_function.3
-engine.3,ENGINE_get_first.3
-engine.3,ENGINE_get_flags.3
-engine.3,ENGINE_get_id.3
-engine.3,ENGINE_get_init_function.3
-engine.3,ENGINE_get_last.3
-engine.3,ENGINE_get_load_privkey_function.3
-engine.3,ENGINE_get_load_pubkey_function.3
-engine.3,ENGINE_get_name.3
-engine.3,ENGINE_get_next.3
-engine.3,ENGINE_get_prev.3
-engine.3,ENGINE_get_table_flags.3
-engine.3,ENGINE_init.3
-engine.3,ENGINE_load_builtin_engines.3
-engine.3,ENGINE_load_cryptodev.3
-engine.3,ENGINE_load_dynamic.3
-engine.3,ENGINE_load_openssl.3
-engine.3,ENGINE_load_private_key.3
-engine.3,ENGINE_load_public_key.3
-engine.3,ENGINE_new.3
-engine.3,ENGINE_register_DH.3
-engine.3,ENGINE_register_DSA.3
-engine.3,ENGINE_register_ECDH.3
-engine.3,ENGINE_register_ECDSA.3
-engine.3,ENGINE_register_RAND.3
-engine.3,ENGINE_register_RSA.3
-engine.3,ENGINE_register_STORE.3
-engine.3,ENGINE_register_all_DH.3
-engine.3,ENGINE_register_all_DSA.3
-engine.3,ENGINE_register_all_ECDH.3
-engine.3,ENGINE_register_all_ECDSA.3
-engine.3,ENGINE_register_all_RAND.3
-engine.3,ENGINE_register_all_RSA.3
-engine.3,ENGINE_register_all_STORE.3
-engine.3,ENGINE_register_all_ciphers.3
-engine.3,ENGINE_register_all_complete.3
-engine.3,ENGINE_register_all_digests.3
-engine.3,ENGINE_register_ciphers.3
-engine.3,ENGINE_register_complete.3
-engine.3,ENGINE_register_digests.3
-engine.3,ENGINE_remove.3
-engine.3,ENGINE_set_DH.3
-engine.3,ENGINE_set_DSA.3
-engine.3,ENGINE_set_ECDH.3
-engine.3,ENGINE_set_ECDSA.3
-engine.3,ENGINE_set_RAND.3
-engine.3,ENGINE_set_RSA.3
-engine.3,ENGINE_set_STORE.3
-engine.3,ENGINE_set_ciphers.3
-engine.3,ENGINE_set_cmd_defns.3
-engine.3,ENGINE_set_ctrl_function.3
-engine.3,ENGINE_set_default.3
-engine.3,ENGINE_set_default_DH.3
-engine.3,ENGINE_set_default_DSA.3
-engine.3,ENGINE_set_default_ECDH.3
-engine.3,ENGINE_set_default_ECDSA.3
-engine.3,ENGINE_set_default_RAND.3
-engine.3,ENGINE_set_default_RSA.3
-engine.3,ENGINE_set_default_ciphers.3
-engine.3,ENGINE_set_default_digests.3
-engine.3,ENGINE_set_default_string.3
-engine.3,ENGINE_set_destroy_function.3
-engine.3,ENGINE_set_digests.3
-engine.3,ENGINE_set_finish_function.3
-engine.3,ENGINE_set_flags.3
-engine.3,ENGINE_set_id.3
-engine.3,ENGINE_set_init_function.3
-engine.3,ENGINE_set_load_privkey_function.3
-engine.3,ENGINE_set_load_pubkey_function.3
-engine.3,ENGINE_set_name.3
-engine.3,ENGINE_set_table_flags.3
-engine.3,ENGINE_unregister_DH.3
-engine.3,ENGINE_unregister_DSA.3
-engine.3,ENGINE_unregister_ECDH.3
-engine.3,ENGINE_unregister_ECDSA.3
-engine.3,ENGINE_unregister_RAND.3
-engine.3,ENGINE_unregister_RSA.3
-engine.3,ENGINE_unregister_STORE.3
-engine.3,ENGINE_unregister_ciphers.3
-engine.3,ENGINE_unregister_digests.3
-engine.3,ENGINE_up_ref.3
 get_rfc3526_prime_8192.3,BN_get_rfc2409_prime_1024.3
 get_rfc3526_prime_8192.3,BN_get_rfc2409_prime_768.3
 get_rfc3526_prime_8192.3,BN_get_rfc3526_prime_1536.3
diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch
index ce62107..a7b3fca 100644
--- a/patches/aeadtest.c.patch
+++ b/patches/aeadtest.c.patch
@@ -1,9 +1,9 @@
---- tests/aeadtest.c.orig       2016-10-18 17:03:33.845870889 +0900
-+++ tests/aeadtest.c    2016-10-18 17:11:19.880841283 +0900
-@@ -75,6 +75,12 @@
- 
+--- tests/aeadtest.c.orig       2018-07-24 21:59:17.000000000 -0500
++++ tests/aeadtest.c    2018-11-07 18:44:43.000000000 -0600
+@@ -76,6 +76,12 @@
+
  #define BUF_MAX 1024
- 
+
 +#ifdef _MSC_VER
 +#ifdef IN
 +#undef IN
diff --git a/patches/bio.h.patch b/patches/bio.h.patch
index 7212b54..e726e20 100644
--- a/patches/bio.h.patch
+++ b/patches/bio.h.patch
@@ -1,12 +1,12 @@
---- include/openssl/bio.h.orig  Mon Oct  3 06:09:28 2016
-+++ include/openssl/bio.h       Sun Nov  6 04:24:57 2016
-@@ -678,8 +678,24 @@
+--- include/openssl/bio.h.orig  2018-07-24 21:59:17.000000000 -0500
++++ include/openssl/bio.h       2018-11-07 18:44:43.000000000 -0600
+@@ -713,6 +713,22 @@
 
  /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/
 
 +#ifdef __MINGW_PRINTF_FORMAT
- int
- BIO_printf(BIO *bio, const char *format, ...)
++int
++BIO_printf(BIO *bio, const char *format, ...)
 +       __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3), __nonnull__(2)));
 +int
 +BIO_vprintf(BIO *bio, const char *format, va_list args)
@@ -20,12 +20,10 @@
 +       __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0),
 +           __nonnull__(3)));
 +#else
-+int
-+BIO_printf(BIO *bio, const char *format, ...)
-        __attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
  int
- BIO_vprintf(BIO *bio, const char *format, va_list args)
-@@ -692,6 +708,8 @@
+ BIO_printf(BIO *bio, const char *format, ...)
+        __attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
+@@ -727,6 +743,8 @@
  BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
         __attribute__((__deprecated__, __format__(__printf__, 3, 0),
             __nonnull__(3)));
diff --git a/patches/http.c.patch b/patches/http.c.patch
deleted file mode 100644
index 0e620cf..0000000
--- a/patches/http.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- apps/ocspcheck/http.c.orig  Sun Jun  4 00:45:29 2017
-+++ apps/ocspcheck/http.c       Sun Jun  4 00:45:57 2017
-@@ -35,7 +35,9 @@
- #include "http.h"
- #include <tls.h>
- 
-+#ifndef DEFAULT_CA_FILE
- #define DEFAULT_CA_FILE "/etc/ssl/cert.pem"
-+#endif
- 
- /*
-  * A buffer for transferring HTTP/S data.
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index 35f88db..07205ec 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,16 +1,6 @@
---- apps/nc/netcat.c.orig       Mon Jul 17 06:06:51 2017
-+++ apps/nc/netcat.c    Mon Jul 17 06:11:24 2017
-@@ -66,7 +66,9 @@
- #define POLL_NETIN     2
- #define POLL_STDOUT    3
- #define BUFSIZE                16384
-+#ifndef DEFAULT_CA_FILE
- #define DEFAULT_CA_FILE        "/etc/ssl/cert.pem"
-+#endif
- 
- #define TLS_ALL        (1 << 1)
- #define TLS_NOVERIFY   (1 << 2)
-@@ -95,9 +97,13 @@
+--- apps/nc/netcat.c.orig       2018-11-07 17:01:38.000000000 -0600
++++ apps/nc/netcat.c    2018-11-07 17:37:57.000000000 -0600
+@@ -92,9 +92,13 @@
  int    Dflag;                                  /* sodebug */
  int    Iflag;                                  /* TCP receive buffer size */
  int    Oflag;                                  /* TCP send buffer size */
@@ -21,10 +11,10 @@
 +#ifdef SO_RTABLE
  int    rtableid = -1;
 +#endif
- 
+
  int    usetls;                                 /* use TLS */
  char    *Cflag;                                        /* Public cert file */
-@@ -266,12 +272,14 @@
+@@ -266,12 +270,14 @@
                 case 'u':
                         uflag = 1;
                         break;
@@ -39,7 +29,7 @@
                 case 'v':
                         vflag = 1;
                         break;
-@@ -318,9 +326,11 @@
+@@ -318,9 +324,11 @@
                 case 'o':
                         oflag = optarg;
                         break;
@@ -51,19 +41,19 @@
                 case 'T':
                         errstr = NULL;
                         errno = 0;
-@@ -344,9 +354,11 @@
+@@ -344,9 +352,11 @@
         argc -= optind;
         argv += optind;
- 
+
 +#ifdef SO_RTABLE
         if (rtableid >= 0)
                 if (setrtable(rtableid) == -1)
                         err(1, "setrtable");
 +#endif
- 
-        if (family == AF_UNIX) {
-                if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
-@@ -892,7 +904,10 @@
+
+        /* Cruft to make sure options are clean, and used properly. */
+        if (argv[0] && !argv[1] && family == AF_UNIX) {
+@@ -909,7 +919,10 @@
  remote_connect(const char *host, const char *port, struct addrinfo hints)
  {
         struct addrinfo *res, *res0;
@@ -72,13 +62,13 @@
 +#ifdef SO_BINDANY
 +       int on = 1;
 +#endif
- 
+
         if ((error = getaddrinfo(host, port, &hints, &res0)))
                 errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
-@@ -907,8 +922,10 @@
+@@ -924,8 +937,10 @@
                 if (sflag || pflag) {
                         struct addrinfo ahints, *ares;
- 
+
 +#ifdef SO_BINDANY
                         /* try SO_BINDANY, but don't insist */
                         setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
@@ -86,8 +76,8 @@
                         memset(&ahints, 0, sizeof(struct addrinfo));
                         ahints.ai_family = res->ai_family;
                         ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -979,7 +996,10 @@
- local_listen(char *host, char *port, struct addrinfo hints)
+@@ -996,7 +1011,10 @@
+ local_listen(const char *host, const char *port, struct addrinfo hints)
  {
         struct addrinfo *res, *res0;
 -       int s = -1, ret, x = 1, save_errno;
@@ -96,24 +86,24 @@
 +       int ret, x = 1;
 +#endif
         int error;
- 
+
         /* Allow nodename to be null. */
-@@ -1000,9 +1020,11 @@
+@@ -1017,9 +1035,11 @@
                     res->ai_protocol)) < 0)
                         continue;
- 
+
 +#ifdef SO_REUSEPORT
                 ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
                 if (ret == -1)
                         err(1, NULL);
 +#endif
- 
+
                 set_common_sockopts(s, res->ai_family);
- 
-@@ -1458,11 +1480,13 @@
+
+@@ -1475,11 +1495,13 @@
  {
         int x = 1;
- 
+
 +#ifdef TCP_MD5SIG
         if (Sflag) {
                 if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
@@ -124,10 +114,10 @@
         if (Dflag) {
                 if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
                         &x, sizeof(x)) == -1)
-@@ -1473,9 +1497,16 @@
+@@ -1490,9 +1512,16 @@
                     IP_TOS, &Tflag, sizeof(Tflag)) == -1)
                         err(1, "set IP ToS");
- 
+
 +#ifdef IPV6_TCLASS
                 else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
                     IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
@@ -141,16 +131,16 @@
         }
         if (Iflag) {
                 if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1499,13 +1530,17 @@
+@@ -1516,13 +1545,17 @@
         }
- 
+
         if (minttl != -1) {
 +#ifdef IP_MINTTL
                 if (af == AF_INET && setsockopt(s, IPPROTO_IP,
                     IP_MINTTL, &minttl, sizeof(minttl)))
                         err(1, "set IP min TTL");
 +#endif
- 
+
 -               else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
 +#ifdef IPV6_MINHOPCOUNT
 +               if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
@@ -159,8 +149,8 @@
 +#endif
         }
  }
- 
-@@ -1714,14 +1749,22 @@
+
+@@ -1748,14 +1781,22 @@
         \t-P proxyuser\tUsername for proxy authentication\n\
         \t-p port\t     Specify local port for remote connects\n\
         \t-R CAfile     CA bundle\n\
diff --git a/patches/ocsp_test.c.patch b/patches/ocsp_test.c.patch
index aa427db..39f1326 100644
--- a/patches/ocsp_test.c.patch
+++ b/patches/ocsp_test.c.patch
@@ -1,9 +1,9 @@
---- tests/ocsp_test.c.orig      2016-10-18 18:12:39.854607509 +0900
-+++ tests/ocsp_test.c   2016-10-18 18:14:29.261600559 +0900
-@@ -16,6 +16,11 @@
+--- tests/ocsp_test.c.orig      2018-07-24 21:59:17.000000000 -0500
++++ tests/ocsp_test.c   2018-11-07 18:44:43.000000000 -0600
+@@ -35,6 +35,11 @@
         hints.ai_family = AF_INET;
         hints.ai_socktype = SOCK_STREAM;
- 
+
 +#ifdef _MSC_VER
 +       if (BIO_sock_init() != 1)
 +               exit(-1);
diff --git a/patches/tls_internal.h.patch b/patches/tls_internal.h.patch
deleted file mode 100644
index e82bf96..0000000
--- a/patches/tls_internal.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tls/tls_internal.h.orig     Sun Jul  9 06:16:17 2017
-+++ tls/tls_internal.h  Mon Jul 17 06:10:01 2017
-@@ -26,7 +26,9 @@
- 
- __BEGIN_HIDDEN_DECLS
- 
-+#ifndef _PATH_SSL_CA_FILE
- #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem"
-+#endif
- 
- #define TLS_CIPHERS_DEFAULT    "TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE"
- #define TLS_CIPHERS_COMPAT     "HIGH:!aNULL"
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index 981fc95..cdec053 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,6 +1,6 @@
---- tests/tlsexttest.c.orig     2017-12-30 20:03:09.279079726 +0900
-+++ tests/tlsexttest.c  2017-12-30 20:07:21.849939140 +0900
-@@ -1676,7 +1676,9 @@ static unsigned char tlsext_sni_clienthe
+--- tests/tlsexttest.c.orig     Wed Nov  7 20:01:26 2018
++++ tests/tlsexttest.c  Wed Nov  7 20:01:35 2018
+@@ -1676,7 +1676,9 @@
  };
  
  static unsigned char tlsext_sni_serverhello[] = {
@@ -10,7 +10,7 @@
  
  static int
  test_tlsext_sni_clienthello(void)
-@@ -1839,9 +1841,9 @@ test_tlsext_sni_serverhello(void)
+@@ -1839,9 +1841,9 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
@@ -22,7 +22,7 @@
                 goto err;
         }
  
-@@ -1850,14 +1852,14 @@ test_tlsext_sni_serverhello(void)
+@@ -1850,14 +1852,14 @@
                 fprintf(stderr, "received:\n");
                 hexdump(data, dlen);
                 fprintf(stderr, "test data:\n");
@@ -39,7 +39,7 @@
         if (!tlsext_sni_serverhello_parse(ssl, &cbs, &alert)) {
                 FAIL("failed to parse serverhello SNI\n");
                 goto err;
-@@ -2741,7 +2743,10 @@ unsigned char tlsext_clienthello_default
+@@ -2741,7 +2743,10 @@
         0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
  };
  
@@ -51,7 +51,7 @@
  
  static int
  test_tlsext_clienthello_build(void)
-@@ -2806,18 +2811,18 @@ test_tlsext_clienthello_build(void)
+@@ -2806,18 +2811,18 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
@@ -74,7 +74,7 @@
                 goto err;
         }
  
-@@ -2832,7 +2837,10 @@ test_tlsext_clienthello_build(void)
+@@ -2832,7 +2837,10 @@
         return (failure);
  }
  
@@ -86,7 +86,7 @@
  
  unsigned char tlsext_serverhello_enabled[] = {
         0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
-@@ -2872,18 +2880,18 @@ test_tlsext_serverhello_build(void)
+@@ -2872,18 +2880,18 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 1a559e6..911d6bc 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -8,7 +8,6 @@ set(
         d1_clnt.c
         d1_enc.c
         d1_lib.c
-        d1_meth.c
         d1_pkt.c
         d1_srtp.c
         d1_srvr.c
@@ -24,21 +23,22 @@ set(
         ssl_err.c
         ssl_init.c
         ssl_lib.c
+        ssl_methods.c
         ssl_packet.c
         ssl_pkt.c
         ssl_rsa.c
         ssl_sess.c
+        ssl_sigalgs.c
         ssl_srvr.c
         ssl_stat.c
         ssl_tlsext.c
         ssl_txt.c
         ssl_versions.c
-        t1_clnt.c
         t1_enc.c
         t1_hash.c
         t1_lib.c
-        t1_meth.c
-        t1_srvr.c
+        tls13_handshake.c
+        tls13_key_schedule.c
 )
 
 add_library(ssl ${SSL_SRC})
@@ -51,9 +51,8 @@ target_include_directories(ssl
 
 if (BUILD_SHARED_LIBS)
         export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
-        target_link_libraries(ssl crypto)
+        target_link_libraries(ssl crypto ${PLATFORM_LIBS})
         if (WIN32)
-                target_link_libraries(ssl Ws2_32.lib)
                 set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
         endif()
         set_target_properties(ssl PROPERTIES
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 189876e..4cc1d1d 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -17,7 +17,6 @@ libssl_la_SOURCES += d1_both.c
 libssl_la_SOURCES += d1_clnt.c
 libssl_la_SOURCES += d1_enc.c
 libssl_la_SOURCES += d1_lib.c
-libssl_la_SOURCES += d1_meth.c
 libssl_la_SOURCES += d1_pkt.c
 libssl_la_SOURCES += d1_srtp.c
 libssl_la_SOURCES += d1_srvr.c
@@ -33,23 +32,26 @@ libssl_la_SOURCES += ssl_clnt.c
 libssl_la_SOURCES += ssl_err.c
 libssl_la_SOURCES += ssl_init.c
 libssl_la_SOURCES += ssl_lib.c
+libssl_la_SOURCES += ssl_methods.c
 libssl_la_SOURCES += ssl_packet.c
 libssl_la_SOURCES += ssl_pkt.c
 libssl_la_SOURCES += ssl_rsa.c
 libssl_la_SOURCES += ssl_sess.c
+libssl_la_SOURCES += ssl_sigalgs.c
 libssl_la_SOURCES += ssl_srvr.c
 libssl_la_SOURCES += ssl_stat.c
 libssl_la_SOURCES += ssl_tlsext.c
 libssl_la_SOURCES += ssl_txt.c
 libssl_la_SOURCES += ssl_versions.c
-libssl_la_SOURCES += t1_clnt.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_hash.c
 libssl_la_SOURCES += t1_lib.c
-libssl_la_SOURCES += t1_meth.c
-libssl_la_SOURCES += t1_srvr.c
+libssl_la_SOURCES += tls13_handshake.c
+libssl_la_SOURCES += tls13_key_schedule.c
 
-noinst_HEADERS = srtp.h
+noinst_HEADERS = bytestring.h
+noinst_HEADERS += srtp.h
 noinst_HEADERS += ssl_locl.h
+noinst_HEADERS += ssl_sigalgs.h
 noinst_HEADERS += ssl_tlsext.h
-noinst_HEADERS += bytestring.h
+noinst_HEADERS += tls13_internal.h
diff --git a/tap-driver.sh b/tap-driver.sh
index 82efa96..2516e9c 100755
--- a/tap-driver.sh
+++ b/tap-driver.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -132,7 +132,7 @@ fi
     # last `echo $?' statement), and would thus die reporting an internal
     # error.
     # For more information, see the Autoconf manual and the threads:
-    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    # <https://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
     # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
     trap : 1 3 2 13 15
     if test $merge -gt 0; then
@@ -643,7 +643,7 @@ test $? -eq 0 || fatal "I/O or internal error"
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c0dc2ae..2a9389d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,6 +69,13 @@ add_executable(bnaddsub bnaddsub.c)
 target_link_libraries(bnaddsub ${OPENSSL_LIBS})
 add_test(bnaddsub bnaddsub)
 
+# bn_rand_interval
+if(NOT BUILD_SHARED_LIBS)
+        add_executable(bn_rand_interval bn_rand_interval.c)
+        target_link_libraries(bn_rand_interval ${OPENSSL_LIBS})
+        add_test(bn_rand_interval bn_rand_interval)
+endif()
+
 # bntest
 if(NOT BUILD_SHARED_LIBS)
         add_executable(bntest bntest.c)
@@ -220,6 +227,10 @@ add_test(igetest igetest)
 
 # keypairtest
 if(NOT BUILD_SHARED_LIBS)
+        add_executable(key_schedule key_schedule.c)
+        target_link_libraries(key_schedule ${OPENSSL_LIBS})
+        add_test(key_schedule key_schedule)
+
         add_executable(keypairtest keypairtest.c)
         target_link_libraries(keypairtest ${OPENSSL_LIBS})
         add_test(keypairtest keypairtest
@@ -467,6 +478,11 @@ add_executable(x25519test x25519test.c)
 target_link_libraries(x25519test ${OPENSSL_LIBS})
 add_test(x25519test x25519test)
 
+# x509name
+add_executable(x509name x509name.c)
+target_link_libraries(x509name ${OPENSSL_LIBS})
+add_test(x509name x509name)
+
 if(BUILD_SHARED_LIBS)
         add_custom_command(TARGET x25519test POST_BUILD
                 COMMAND "${CMAKE_COMMAND}" -E copy
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 49d1110..256eb44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -82,6 +82,11 @@ TESTS += bnaddsub
 check_PROGRAMS += bnaddsub
 bnaddsub_SOURCES = bnaddsub.c
 
+# bn_rand_interval
+TESTS += bn_rand_interval
+check_PROGRAMS += bn_rand_interval
+bn_rand_interval_SOURCES = bn_rand_interval.c
+
 # bntest
 TESTS += bntest
 bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
@@ -231,6 +236,11 @@ check_PROGRAMS += keypairtest
 keypairtest_SOURCES = keypairtest.c
 EXTRA_DIST += keypairtest.sh
 
+# key_schedule
+TESTS += key_schedule
+check_PROGRAMS += key_schedule
+key_schedule_SOURCES = key_schedule.c
+
 # md4test
 TESTS += md4test
 check_PROGRAMS += md4test
@@ -420,3 +430,8 @@ verifytest_SOURCES = verifytest.c
 TESTS += x25519test
 check_PROGRAMS += x25519test
 x25519test_SOURCES = x25519test.c
+
+# x509name
+TESTS += x509name
+check_PROGRAMS += x509name
+x509name_SOURCES = x509name.c
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 3d6dea4..337e89b 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -40,9 +40,8 @@ target_include_directories(tls
 
 if (BUILD_SHARED_LIBS)
         export_symbol(tls ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym)
-        target_link_libraries(tls ssl crypto)
+        target_link_libraries(tls ssl crypto ${PLATFORM_LIBS})
         if (WIN32)
-                target_link_libraries(tls Ws2_32.lib)
                 set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
         endif()
         set_target_properties(tls PROPERTIES
diff --git a/update.sh b/update.sh
index 2cfbb33..3315311 100755
--- a/update.sh
+++ b/update.sh
@@ -32,17 +32,17 @@ bin_src=$OPENBSD_SRC/usr.bin
 sbin_src=$OPENBSD_SRC/usr.sbin
 
 # load library versions
-. $libcrypto_src/shlib_version
+. "$libcrypto_src/shlib_version"
 libcrypto_version=$major:$minor:0
 echo "libcrypto version $libcrypto_version"
 echo $libcrypto_version > crypto/VERSION
 
-. $libssl_src/shlib_version
+. "$libssl_src/shlib_version"
 libssl_version=$major:$minor:0
 echo "libssl version $libssl_version"
 echo $libssl_version > ssl/VERSION
 
-. $libtls_src/shlib_version
+. "$libtls_src/shlib_version"
 libtls_version=$major:$minor:0
 echo "libtls version $libtls_version"
 echo $libtls_version > tls/VERSION
@@ -126,7 +126,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
         ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
         pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
-        asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h
+        x509v3/x509v3.h conf/conf.h ocsp/ocsp.h
         aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h
         bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h
         dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
@@ -154,6 +154,7 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
         fi
 done
 $CP crypto/compat/b_win.c crypto/bio
+$CP crypto/compat/crypto_lock_win.c crypto
 $CP crypto/compat/ui_openssl_win.c crypto/ui
 # add the libcrypto symbol export list
 $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym
@@ -178,8 +179,21 @@ gen_asm() {
         EOF
         $MV $3.tmp $3
 }
+
+echo generating arm ASM source for elf
+gen_asm_stdout elf aes/asm/aes-armv4.pl crypto/aes/aes-elf-armv4.S
+gen_asm_stdout elf bn/asm/armv4-gf2m.pl crypto/bn/gf2m-elf-armv4.S
+gen_asm_stdout elf bn/asm/armv4-mont.pl crypto/bn/mont-elf-armv4.S
+gen_asm_stdout elf sha/asm/sha1-armv4-large.pl crypto/sha/sha1-elf-armv4.S
+gen_asm_stdout elf sha/asm/sha256-armv4.pl crypto/sha/sha256-elf-armv4.S
+gen_asm_stdout elf sha/asm/sha512-armv4.pl crypto/sha/sha512-elf-armv4.S
+gen_asm_stdout elf modes/asm/ghash-armv4.pl crypto/modes/ghash-elf-armv4.S
+$CP $libcrypto_src/armv4cpuid.S crypto
+$CP $libcrypto_src/armcap.c crypto
+$CP $libcrypto_src/arm_arch.h crypto
+
 for abi in elf macosx; do
-        echo generating ASM source for $abi
+        echo generating x86_64 ASM source for $abi
         gen_asm_stdout $abi aes/asm/aes-x86_64.pl        crypto/aes/aes-$abi-x86_64.S
         gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl      crypto/aes/vpaes-$abi-x86_64.S
         gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl      crypto/aes/bsaes-$abi-x86_64.S