9 files changed, 71 insertions, 0 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index e74d97b..2c0268c 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -999,6 +999,7 @@ target_include_directories(crypto_obj
                 hmac
                 modes
                 ocsp
+                pkcs12
                 rsa
                 x509
                 ../include/compat
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index dc4d340..01833d2 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/hmac
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ocsp
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/pkcs12
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/rsa
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I$(top_srcdir)/crypto
@@ -842,6 +843,7 @@ libcrypto_la_SOURCES += pkcs12/p12_p8e.c
 libcrypto_la_SOURCES += pkcs12/p12_sbag.c
 libcrypto_la_SOURCES += pkcs12/p12_utl.c
 libcrypto_la_SOURCES += pkcs12/pk12err.c
+noinst_HEADERS += pkcs12/pkcs12_local.h
 
 # pkcs7
 libcrypto_la_SOURCES += pkcs7/bio_pk7.c
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index 3c93df8..5b9ceb1 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 --- tests/tlsexttest.c.orig     Mon Aug 15 07:54:28 2022
 +++ tests/tlsexttest.c  Mon Aug 15 07:57:01 2022
 @@ -1773,7 +1773,9 @@ static unsigned char tlsext_sni_client[] = {
+=======
+--- tests/tlsexttest.c.orig     Mon Aug 29 06:02:26 2022
++++ tests/tlsexttest.c  Mon Aug 29 06:18:01 2022
+@@ -1773,7 +1773,9 @@
+>>>>>>> 051c15d (build updates for latest upstream)
  };
  
  static unsigned char tlsext_sni_server[] = {
@@ -10,7 +16,11 @@
  
  static int
  test_tlsext_sni_client(void)
+<<<<<<< HEAD
 @@ -1971,9 +1973,9 @@ test_tlsext_sni_server(void)
+=======
+@@ -1971,9 +1973,9 @@
+>>>>>>> 051c15d (build updates for latest upstream)
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
@@ -22,7 +32,11 @@
                 goto err;
         }
  
+<<<<<<< HEAD
 @@ -1982,14 +1984,14 @@ test_tlsext_sni_server(void)
+=======
+@@ -1982,14 +1984,14 @@
+>>>>>>> 051c15d (build updates for latest upstream)
                 fprintf(stderr, "received:\n");
                 hexdump(data, dlen);
                 fprintf(stderr, "test data:\n");
@@ -39,7 +53,11 @@
         if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
                 FAIL("failed to parse server SNI\n");
                 goto err;
+<<<<<<< HEAD
 @@ -3194,7 +3196,10 @@ unsigned char tlsext_clienthello_default[] = {
+=======
+@@ -3196,7 +3198,10 @@
+>>>>>>> 051c15d (build updates for latest upstream)
         0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
  };
  
@@ -51,7 +69,11 @@
  
  static int
  test_tlsext_clienthello_build(void)
+<<<<<<< HEAD
 @@ -3280,18 +3285,18 @@ test_tlsext_clienthello_build(void)
+=======
+@@ -3282,18 +3287,18 @@
+>>>>>>> 051c15d (build updates for latest upstream)
                 goto err;
         }
  
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index e4af7ca..8e974a8 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -37,6 +37,7 @@ set(
         tls_buffer.c
         tls_content.c
         tls_key_share.c
+        tls_lib.c
         tls12_key_schedule.c
         tls12_lib.c
         tls12_record_layer.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 42b548c..d5c0466 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -76,6 +76,7 @@ libssl_la_SOURCES += t1_lib.c
 libssl_la_SOURCES += tls_buffer.c
 libssl_la_SOURCES += tls_content.c
 libssl_la_SOURCES += tls_key_share.c
+libssl_la_SOURCES += tls_lib.c
 libssl_la_SOURCES += tls12_key_schedule.c
 libssl_la_SOURCES += tls12_lib.c
 libssl_la_SOURCES += tls12_record_layer.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eb1b79c..7e80c97 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -413,6 +413,17 @@ else()
 endif()
 set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
+# quictest
+set(QUICTEST_SRC quictest.c)
+add_executable(quictest ${QUICTEST_SRC})
+target_link_libraries(quictest ${OPENSSL_TEST_LIBS})
+if(NOT MSVC)
+        add_test(NAME quictest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/quictest.sh)
+else()
+        add_test(NAME quictest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/quictest.bat $<TARGET_FILE:quictest>)
+endif()
+set_tests_properties(quictest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+
 # randtest
 add_executable(randtest randtest.c)
 target_link_libraries(randtest ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 79f10fb..2a48a2b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -425,6 +425,12 @@ pq_test_SOURCES = pq_test.c
 EXTRA_DIST += pq_test.sh pq_test.bat
 EXTRA_DIST += pq_expected.txt
 
+# quictest
+TESTS += quictest.sh
+check_PROGRAMS += quictest
+quictest_SOURCES = quictest.c
+EXTRA_DIST += quictest.sh quictest.bat
+
 # randtest
 TESTS += randtest
 check_PROGRAMS += randtest
diff --git a/tests/quictest.bat b/tests/quictest.bat
new file mode 100644
index 0000000..cfbf2cd
--- /dev/null
+++ b/tests/quictest.bat
@@ -0,0 +1,14 @@
+@echo off

+setlocal enabledelayedexpansion

+REM     quictest.bat

+

+set quictest_bin=%1

+set quictest_bin=%quictest_bin:/=\%

+if not exist %quictest_bin% exit /b 1

+

+%quictest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem

+if !errorlevel! neq 0 (

+        exit /b 1

+)

+

+endlocal

diff --git a/tests/quictest.sh b/tests/quictest.sh
new file mode 100755
index 0000000..cc1982f
--- /dev/null
+++ b/tests/quictest.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+quictest_bin=./quictest
+if [ -e ./quictest.exe ]; then
+        quictest_bin=./quictest.exe
+fi
+
+if [ -z $srcdir ]; then
+        srcdir=.
+fi
+
+$quictest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem