15 files changed, 355 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index cba5873..8a70b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,9 +30,110 @@ LibreSSL Portable Release Notes:
 
 3.2.1 - Development release
 
-        * Enforce in the TLS 1.3 server that ClientHello messages
-        following a HelloRetryRequest must match the original ClientHello
-        as per RFC 8446 section 4.1.2
+        * Propagate alerts from the read half of the TLSv1.3 record layer to I/O
+          functions.
+
+        * Send a record overflow alert for TLSv1.3 messages having overlong
+          plaintext or inner plaintext.
+
+        * Send an illegal parameter alert if a client sends an invalid DH key
+          share.
+
+        * Document PKCS7_final(3), PKCS7_add_attribute(3).
+
+        * Collapse x509v3 directory into x509.
+
+        * Improve TLSv1.3 client certificate selection to allow EC certificates
+          instead of only RSA certificates.
+
+        * Fail on receiving an invalid NID in X509_ATTRIBUTE_create() instead
+          of constructing a broken objects that may cause NULL pointer accesses.
+
+        * Add support for additional GOST curves from RFC 7836 and
+          draft-deremin-rfc4491-bis.
+
+        * Add OIDs for HMAC using the Streebog hash function.
+
+        * Allow GOST R 34.11-2012 in PBE/PBKDF2/PKCS#5.
+
+        * Enable GOST_SIG_FORMAT_RS_LE when verifying certificate signatures.
+
+        * Handle GOST in ssl_cert_dup().
+
+        * Stop sending GOST R 34.10-94 as a CertificateType.
+
+        * Use IANA allocated GOST ClientCertificateTypes.
+
+        * Add a custom copy handler for AES keywrap to fix a use-after-free.
+
+        * Enforce in the TLSv1.3 server that that ClientHello messages after
+          a HelloRetryRequest match the original ClientHello as per RFC 8446
+          section 4.1.2
+
+        * Document more PKCS7 attribute functions.
+
+        * Document PKCS7_get_signer_info(3).
+
+        * Document PEM_ASN1_read(3) and PEM_ASN1_read_bio(3).
+
+        * Document PEM_def_callback(3).
+
+        * Document EVP_read_pw_string_min(3).
+
+        * Merge documentation of X509_get0_serialNumber from OpenSSL 1.1.1.
+
+        * Document error handling of X509_PUBKEY_get0(3) and X509_PUBKEY_get(3)
+
+        * Document X509_get0_pubkey_bitstr(3).
+
+        * Fix an off-by-one in the CBS padding removal. From BoringSSL.
+
+        * Enforce restrictions on extensions present in the ClientHello as per
+          RFC 8446, section 9.2.
+
+        * Add new CMAC_Init(3) and ChaCha(3) manual pages.
+
+        * Fix SSL_shutdown behavior to match the legacy stack.  The previous
+          behavior could cause a hang.
+
+        * Add initial support for openbsd/powerpc64.
+
+        * Make the message type available in the internal TLS extensions API
+          functions.
+
+        * Enable TLSv1.3 for the generic TLS_method().
+
+        * Convert openssl(1) s_client option handling.
+
+        * Document openssl(1) certhash.
+
+        * Convert openssl(1) verify option handling.
+
+        * Fix a longstanding bug in PEM_X509_INFO_read_bio(3) that could cause
+          use-after-free and double-free issues in calling programs.
+
+        * Document PEM_X509_INFO_read(3) and PEM_X509_INFO_read_bio(3).
+
+        * Handle SSL_MODE_AUTO_RETRY being changed during a TLSv1.3 session.
+
+        * Convert openssl(1) s_server option handling.
+
+        * Add minimal info callback support for TLSv1.3.
+
+        * Refactor, clean up and simplify some SSL3/DTLS1 record writing code.
+
+        * Correctly handle server requests for an OCSP response.
+
+        * Add the P-521 curve to the list of curves supported by default
+          in the client.
+
+        * Convert openssl(1) req option handling.
+
+        * Avoid calling freezero with a negative size if a server sends a
+          malformed plaintext of all zeroes.
+
+        * Send an unexpected message alert if no valid content type is found
+          in a TLSv1.3 record.
 
 3.2.0 - Development release
 
@@ -96,6 +197,36 @@ LibreSSL Portable Release Notes:
 
         * Use non-expired certificates first when building a certificate chain.
 
+3.1.4 - Interoperability and bug fixes for the TLSv1.3 client:
+
+        * Improve client certificate selection to allow EC certificates
+          instead of only RSA certificates.
+
+        * Do not error out if a TLSv1.3 server requests an OCSP response as
+          part of a certificate request.
+
+        * Fix SSL_shutdown behavior to match the legacy stack.  The previous
+          behaviour could cause a hang.
+
+        * Fix a memory leak and add a missing error check in the handling of
+          the key update message.
+
+        * Fix a memory leak in tls13_record_layer_set_traffic_key.
+
+        * Avoid calling freezero with a negative size if a server sends a
+          malformed plaintext of all zeroes.
+
+        * Ensure that only PSS may be used with RSA in TLSv1.3 in order
+          to avoid using PKCS1-based signatures.
+
+        * Add the P-521 curve to the list of curves supported by default
+          in the client.
+
+3.1.3 - Bug fix
+
+        * libcrypto may fail to build a valid certificate chain due to
+          expired untrusted issuer certificates.
+
 3.1.2 - Bug fix
 
         * A TLS client with peer verification disabled may crash when
diff --git a/README.md b/README.md
index a4341b0..f978bb4 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ the LibreSSL portable project attempts to provide working alternatives for
 other operating systems, and assists with improving OS-native implementations
 where possible.
 
-At the time of this writing, LibreSSL is know to build and work on:
+At the time of this writing, LibreSSL is known to build and work on:
 
 * Linux (kernel 3.17 or later recommended)
 * FreeBSD (tested with 9.2 and later)
diff --git a/appveyor.yml b/appveyor.yml
index 4e0b488..df1b448 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,5 +43,13 @@ build_script:
   - cmake --build . --config %CONFIG%
 
 test_script:
-  # TODO: Determine how to run ssltest on AppVeyor
-  - ctest -C %CONFIG% --timeout 150 --output-on-failure -E ssltest
+  - ctest -C %CONFIG% --timeout 150 --output-on-failure
+
+on_failure:
+  - 7z a Testing.zip Testing
+  - appveyor PushArtifact Testing.zip
+
+artifacts:
+  - path: build\Testing
+    name: Testing
+    type: zip
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 4c5a143..e57e6c2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -394,7 +394,6 @@ set(
         cms/cms_ess.c
         cms/cms_io.c
         cms/cms_kari.c
-        cms/cms_lcl.h
         cms/cms_lib.c
         cms/cms_pwri.c
         cms/cms_sd.c
diff --git a/m4/ax_add_fortify_source.m4 b/m4/ax_add_fortify_source.m4
new file mode 100644
index 0000000..7e15312
--- /dev/null
+++ b/m4/ax_add_fortify_source.m4
@@ -0,0 +1,80 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_ADD_FORTIFY_SOURCE
+#
+# DESCRIPTION
+#
+#   Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
+#   redefinition warnings, other cpp warnings or linker. Some distributions
+#   (such as Gentoo Linux) enable _FORTIFY_SOURCE globally in their
+#   compilers, leading to unnecessary warnings in the form of
+#
+#     <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+#     <built-in>: note: this is the location of the previous definition
+#
+#   which is a problem if -Werror is enabled. This macro checks whether
+#   _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
+#   to CPPFLAGS.
+#
+#   Newer mingw-w64 msys2 package comes with a bug in
+#   headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support,
+#   and would need -lssp or -fstack-protector.  See
+#   https://github.com/msys2/MINGW-packages/issues/5803. Try to actually
+#   link it.
+#
+# LICENSE
+#
+#   Copyright (c) 2017 David Seifert <soap@gentoo.org>
+#   Copyright (c) 2019 Reini Urban <rurban@cpan.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 4
+
+AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
+    ac_save_cflags=$CFLAGS
+    ac_cwerror_flag=yes
+    AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"])
+    AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([],
+            [[
+                #ifndef _FORTIFY_SOURCE
+                    return 0;
+                #else
+                    this_is_an_error;
+                #endif
+            ]]
+        )],
+        AC_LINK_IFELSE([
+            AC_LANG_SOURCE([[
+                #define _FORTIFY_SOURCE 2
+                #include <string.h>
+                int main() {
+                    char *s = " ";
+                    strcpy(s, "x");
+                    return strlen(s)-1;
+                }
+              ]]
+            )],
+            [
+              AC_MSG_RESULT([yes])
+              CFLAGS=$ac_save_cflags
+              CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+            ], [
+              AC_MSG_RESULT([no])
+              CFLAGS=$ac_save_cflags
+            ],
+        ),
+        [
+          AC_MSG_RESULT([no])
+          CFLAGS=$ac_save_cflags
+        ])
+])
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
new file mode 100644
index 0000000..bd753b3
--- /dev/null
+++ b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,53 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4
index 3ffdb1a..869f00b 100644
--- a/m4/check-hardening-options.m4
+++ b/m4/check-hardening-options.m4
@@ -73,7 +73,7 @@ AC_DEFUN([CHECK_C_HARDENING_OPTIONS], [
                 CHECK_CFLAG([[-fno-strict-overflow]])
 
                 # _FORTIFY_SOURCE replaces builtin functions with safer versions.
-                CHECK_CFLAG([[-D_FORTIFY_SOURCE=2]])
+                AX_ADD_FORTIFY_SOURCE
 
                 # Enable read only relocations
                 CHECK_LDFLAG([[-Wl,-z,relro]])
diff --git a/man/links b/man/links
index 337d3d8..c01e8fa 100644
--- a/man/links
+++ b/man/links
@@ -374,6 +374,14 @@ BUF_MEM_new.3,BUF_MEM_grow.3
 BUF_MEM_new.3,BUF_MEM_grow_clean.3
 BUF_MEM_new.3,BUF_reverse.3
 BUF_MEM_new.3,BUF_strdup.3
+CMAC_Init.3,CMAC_CTX_cleanup.3
+CMAC_Init.3,CMAC_CTX_copy.3
+CMAC_Init.3,CMAC_CTX_free.3
+CMAC_Init.3,CMAC_CTX_get0_cipher_ctx.3
+CMAC_Init.3,CMAC_CTX_new.3
+CMAC_Init.3,CMAC_Final.3
+CMAC_Init.3,CMAC_Update.3
+CMAC_Init.3,CMAC_resume.3
 CMS_ContentInfo_new.3,CMS_ContentInfo_free.3
 CMS_ContentInfo_new.3,CMS_ContentInfo_print_ctx.3
 CMS_ContentInfo_new.3,CMS_ReceiptRequest_free.3
@@ -432,6 +440,11 @@ CRYPTO_set_ex_data.3,CRYPTO_free_ex_data.3
 CRYPTO_set_ex_data.3,CRYPTO_get_ex_data.3
 CRYPTO_set_ex_data.3,CRYPTO_get_ex_new_index.3
 CRYPTO_set_ex_data.3,CRYPTO_new_ex_data.3
+ChaCha.3,CRYPTO_chacha_20.3
+ChaCha.3,CRYPTO_hchacha_20.3
+ChaCha.3,CRYPTO_xchacha_20.3
+ChaCha.3,ChaCha_set_iv.3
+ChaCha.3,ChaCha_set_key.3
 DES_set_key.3,DES_cbc_cksum.3
 DES_set_key.3,DES_cfb64_encrypt.3
 DES_set_key.3,DES_cfb_encrypt.3
@@ -1257,11 +1270,16 @@ OPENSSL_sk_new.3,sk_zero.3
 OpenSSL_add_all_algorithms.3,EVP_cleanup.3
 OpenSSL_add_all_algorithms.3,OpenSSL_add_all_ciphers.3
 OpenSSL_add_all_algorithms.3,OpenSSL_add_all_digests.3
+PEM_ASN1_read.3,PEM_ASN1_read_bio.3
+PEM_ASN1_read.3,d2i_of_void.3
+PEM_X509_INFO_read.3,PEM_X509_INFO_read_bio.3
+PEM_read.3,PEM_def_callback.3
 PEM_read.3,PEM_do_header.3
 PEM_read.3,PEM_get_EVP_CIPHER_INFO.3
 PEM_read.3,PEM_read_bio.3
 PEM_read.3,PEM_write.3
 PEM_read.3,PEM_write_bio.3
+PEM_read.3,pem_password_cb.3
 PEM_read_SSL_SESSION.3,PEM_read_bio_SSL_SESSION.3
 PEM_read_SSL_SESSION.3,PEM_write_SSL_SESSION.3
 PEM_read_SSL_SESSION.3,PEM_write_bio_SSL_SESSION.3
@@ -1354,7 +1372,6 @@ PEM_read_bio_PrivateKey.3,PEM_write_bio_X509_AUX.3
 PEM_read_bio_PrivateKey.3,PEM_write_bio_X509_CRL.3
 PEM_read_bio_PrivateKey.3,PEM_write_bio_X509_REQ.3
 PEM_read_bio_PrivateKey.3,PEM_write_bio_X509_REQ_NEW.3
-PEM_read_bio_PrivateKey.3,pem_password_cb.3
 PKCS12_SAFEBAG_new.3,PKCS12_BAGS_free.3
 PKCS12_SAFEBAG_new.3,PKCS12_BAGS_new.3
 PKCS12_SAFEBAG_new.3,PKCS12_SAFEBAG_free.3
@@ -1362,6 +1379,15 @@ PKCS12_new.3,PKCS12_MAC_DATA_free.3
 PKCS12_new.3,PKCS12_MAC_DATA_new.3
 PKCS12_new.3,PKCS12_free.3
 PKCS5_PBKDF2_HMAC.3,PKCS5_PBKDF2_HMAC_SHA1.3
+PKCS7_add_attribute.3,PKCS7_add0_attrib_signing_time.3
+PKCS7_add_attribute.3,PKCS7_add1_attrib_digest.3
+PKCS7_add_attribute.3,PKCS7_add_attrib_content_type.3
+PKCS7_add_attribute.3,PKCS7_add_attrib_smimecap.3
+PKCS7_add_attribute.3,PKCS7_add_signed_attribute.3
+PKCS7_add_attribute.3,PKCS7_get_attribute.3
+PKCS7_add_attribute.3,PKCS7_get_signed_attribute.3
+PKCS7_add_attribute.3,PKCS7_set_attributes.3
+PKCS7_add_attribute.3,PKCS7_set_signed_attributes.3
 PKCS7_new.3,PKCS7_DIGEST_free.3
 PKCS7_new.3,PKCS7_DIGEST_new.3
 PKCS7_new.3,PKCS7_ENCRYPT_free.3
@@ -2030,26 +2056,37 @@ X509_digest.3,X509_REQ_digest.3
 X509_digest.3,X509_pubkey_digest.3
 X509_get0_notBefore.3,X509_CRL_get0_lastUpdate.3
 X509_get0_notBefore.3,X509_CRL_get0_nextUpdate.3
+X509_get0_notBefore.3,X509_CRL_get_lastUpdate.3
+X509_get0_notBefore.3,X509_CRL_get_nextUpdate.3
 X509_get0_notBefore.3,X509_CRL_set1_lastUpdate.3
 X509_get0_notBefore.3,X509_CRL_set1_nextUpdate.3
+X509_get0_notBefore.3,X509_CRL_set_lastUpdate.3
+X509_get0_notBefore.3,X509_CRL_set_nextUpdate.3
 X509_get0_notBefore.3,X509_get0_notAfter.3
+X509_get0_notBefore.3,X509_get_notAfter.3
+X509_get0_notBefore.3,X509_get_notBefore.3
 X509_get0_notBefore.3,X509_getm_notAfter.3
 X509_get0_notBefore.3,X509_getm_notBefore.3
 X509_get0_notBefore.3,X509_set1_notAfter.3
 X509_get0_notBefore.3,X509_set1_notBefore.3
+X509_get0_notBefore.3,X509_set_notAfter.3
+X509_get0_notBefore.3,X509_set_notBefore.3
 X509_get0_signature.3,X509_CRL_get0_signature.3
 X509_get0_signature.3,X509_CRL_get_signature_nid.3
 X509_get0_signature.3,X509_REQ_get0_signature.3
 X509_get0_signature.3,X509_REQ_get_signature_nid.3
 X509_get0_signature.3,X509_get0_tbs_sigalg.3
 X509_get0_signature.3,X509_get_signature_nid.3
+X509_get0_signature.3,X509_get_signature_type.3
 X509_get1_email.3,X509_email_free.3
 X509_get1_email.3,X509_get1_ocsp.3
 X509_get_pubkey.3,X509_REQ_get_pubkey.3
 X509_get_pubkey.3,X509_REQ_set_pubkey.3
 X509_get_pubkey.3,X509_get0_pubkey.3
+X509_get_pubkey.3,X509_get0_pubkey_bitstr.3
 X509_get_pubkey.3,X509_get_X509_PUBKEY.3
 X509_get_pubkey.3,X509_set_pubkey.3
+X509_get_serialNumber.3,X509_get0_serialNumber.3
 X509_get_serialNumber.3,X509_set_serialNumber.3
 X509_get_subject_name.3,X509_CRL_get_issuer.3
 X509_get_subject_name.3,X509_CRL_set_issuer_name.3
@@ -2444,6 +2481,7 @@ d2i_X509_SIG.3,i2d_PKCS8_bio.3
 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,EVP_read_pw_string_min.3
 des_read_pw.3,des_read_pw_string.3
 get_rfc3526_prime_8192.3,BN_get_rfc2409_prime_1024.3
 get_rfc3526_prime_8192.3,BN_get_rfc2409_prime_768.3
diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch
index a7b3fca..4f7319d 100644
--- a/patches/aeadtest.c.patch
+++ b/patches/aeadtest.c.patch
@@ -1,9 +1,9 @@
---- 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 @@
-
+--- tests/aeadtest.c.orig       Sat Jan 26 12:39:05 2019
++++ tests/aeadtest.c    Fri Sep  4 04:04:26 2020
+@@ -79,6 +79,12 @@
+ 
  #define BUF_MAX 1024
-
+ 
 +#ifdef _MSC_VER
 +#ifdef IN
 +#undef IN
diff --git a/patches/handshake_table.c.patch b/patches/handshake_table.c.patch
index 46f2adb..b0a9f5b 100644
--- a/patches/handshake_table.c.patch
+++ b/patches/handshake_table.c.patch
@@ -1,6 +1,6 @@
---- tests/handshake_table.c.orig        Mon May  4 23:28:43 2020
-+++ tests/handshake_table.c     Mon May  4 23:29:50 2020
-@@ -477,6 +477,7 @@
+--- tests/handshake_table.c.orig        Sat Aug 22 18:51:52 2020
++++ tests/handshake_table.c     Fri Sep  4 04:04:26 2020
+@@ -479,6 +479,7 @@
         unsigned int    depth = 0;
         int             ch, graphviz = 0, print = 0;
  
@@ -8,7 +8,7 @@
         while ((ch = getopt(argc, argv, "Cg")) != -1) {
                 switch (ch) {
                 case 'C':
-@@ -494,6 +495,7 @@
+@@ -496,6 +497,7 @@
  
         if (argc != 0)
                 usage();
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index c41f25b..2c2a3da 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
---- apps/openssl/openssl.c.orig Fri Dec 14 01:44:33 2018
-+++ apps/openssl/openssl.c      Sat Jan 19 22:19:23 2019
-@@ -350,7 +350,9 @@
+--- apps/openssl/openssl.c.orig Thu Nov  7 18:19:01 2019
++++ apps/openssl/openssl.c      Fri Sep  4 04:04:26 2020
+@@ -360,7 +360,9 @@
  static void
  openssl_startup(void)
  {
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index 35092c5..70a7efb 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,6 +1,6 @@
---- tests/tlsexttest.c.orig     Mon Jul  6 03:17:51 2020
-+++ tests/tlsexttest.c  Mon Jul  6 03:45:00 2020
-@@ -1657,7 +1657,9 @@
+--- tests/tlsexttest.c.orig     Sat Aug 22 18:51:52 2020
++++ tests/tlsexttest.c  Fri Sep  4 04:04:26 2020
+@@ -1658,7 +1658,9 @@
  };
  
  static unsigned char tlsext_sni_server[] = {
@@ -10,7 +10,7 @@
  
  static int
  test_tlsext_sni_client(void)
-@@ -1820,9 +1822,9 @@
+@@ -1821,9 +1823,9 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
@@ -22,7 +22,7 @@
                 goto err;
         }
  
-@@ -1831,14 +1833,14 @@
+@@ -1832,14 +1834,14 @@
                 fprintf(stderr, "received:\n");
                 hexdump(data, dlen);
                 fprintf(stderr, "test data:\n");
@@ -39,8 +39,8 @@
         if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
                 FAIL("failed to parse server SNI\n");
                 goto err;
-@@ -2722,7 +2724,10 @@
-        0x02, 0x01, 0x02, 0x03,
+@@ -2723,7 +2725,10 @@
+        0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
  };
  
 -unsigned char tlsext_clienthello_disabled[] = {};
@@ -51,7 +51,7 @@
  
  static int
  test_tlsext_clienthello_build(void)
-@@ -2787,18 +2792,18 @@
+@@ -2788,18 +2793,18 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 39f8192..015cb62 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -38,6 +38,7 @@ set(
         ssl_versions.c
         t1_enc.c
         t1_lib.c
+        tls12_record_layer.c
         tls13_buffer.c
         tls13_client.c
         tls13_error.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index a7bb8a3..dded59f 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -47,6 +47,7 @@ libssl_la_SOURCES += ssl_txt.c
 libssl_la_SOURCES += ssl_versions.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_lib.c
+libssl_la_SOURCES += tls12_record_layer.c
 libssl_la_SOURCES += tls13_buffer.c
 libssl_la_SOURCES += tls13_client.c
 libssl_la_SOURCES += tls13_error.c
diff --git a/tests/testssl.bat b/tests/testssl.bat
index 1a55f76..4c3ca1b 100644
--- a/tests/testssl.bat
+++ b/tests/testssl.bat
@@ -11,7 +11,10 @@ set extra=%6
 

 %openssl% version & if !errorlevel! neq 0 exit /b 1

 

-for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find /c "DSA Public Key"`) do set lines=%%s

+set lines=0

+for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find "DSA Public Key"`) do (

+  set /a lines=%lines%+1

+)

 if %lines% gtr 0 (

   set dsa_cert=YES

 ) else (

@@ -60,6 +63,17 @@ for %%p in ( SSLv3,TLSv1.2 ) do (
   echo "Testing ciphersuites for %%p"

   for /f "usebackq" %%c in (`%openssl% ciphers -v "%%p+aRSA" ^| find "%%p"`) do (

     echo "Testing %%c"

+    %ssltest% -cipher %%c -tls1_2

+    if !errorlevel! neq 0 (

+      echo "Failed %%c"

+      exit /b 1

+    )

+  )

+)

+for %%p in ( TLSv1.3 ) do (

+  echo "Testing ciphersuites for %%p"

+  for /f "usebackq" %%c in (`%openssl% ciphers -v "%%p" ^| find "%%p"`) do (

+    echo "Testing %%c"

     %ssltest% -cipher %%c

     if !errorlevel! neq 0 (

       echo "Failed %%c"