factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build updates for latest upstream

Browse Source
This commit is contained in:
Brent Cook 2022-08-29 08:42:43 -05:00
parent 08895e8497
commit ed9359727a
9 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/CMakeLists.txt
View File

@ -999,6 +999,7 @@ target_include_directories(crypto_obj
hmac hmac
modes modes
ocsp ocsp
pkcs12
rsa rsa
x509 x509
../include/compat ../include/compat

2
crypto/Makefile.am
View File

@ -15,6 +15,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
AM_CPPFLAGS += -I$(top_srcdir)/crypto/hmac AM_CPPFLAGS += -I$(top_srcdir)/crypto/hmac
AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
AM_CPPFLAGS += -I$(top_srcdir)/crypto/ocsp 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/rsa
AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509 AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
AM_CPPFLAGS += -I$(top_srcdir)/crypto 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_sbag.c
libcrypto_la_SOURCES += pkcs12/p12_utl.c libcrypto_la_SOURCES += pkcs12/p12_utl.c
libcrypto_la_SOURCES += pkcs12/pk12err.c libcrypto_la_SOURCES += pkcs12/pk12err.c
noinst_HEADERS += pkcs12/pkcs12_local.h
# pkcs7 # pkcs7
libcrypto_la_SOURCES += pkcs7/bio_pk7.c libcrypto_la_SOURCES += pkcs7/bio_pk7.c

22
patches/tlsexttest.c.patch
View File

@ -1,6 +1,12 @@
<<<<<<< HEAD
--- tests/tlsexttest.c.orig Mon Aug 15 07:54:28 2022 --- tests/tlsexttest.c.orig Mon Aug 15 07:54:28 2022
+++ tests/tlsexttest.c Mon Aug 15 07:57:01 2022 +++ tests/tlsexttest.c Mon Aug 15 07:57:01 2022
@@ -1773,7 +1773,9 @@ static unsigned char tlsext_sni_client[] = { @@ -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[] = { static unsigned char tlsext_sni_server[] = {
@ -10,7 +16,11 @@
static int static int
test_tlsext_sni_client(void) test_tlsext_sni_client(void)
<<<<<<< HEAD
@@ -1971,9 +1973,9 @@ test_tlsext_sni_server(void) @@ -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)) if (!CBB_finish(&cbb, &data, &dlen))
errx(1, "failed to finish CBB"); errx(1, "failed to finish CBB");
@ -22,7 +32,11 @@
goto err; goto err;
} }
<<<<<<< HEAD
@@ -1982,14 +1984,14 @@ test_tlsext_sni_server(void) @@ -1982,14 +1984,14 @@ test_tlsext_sni_server(void)
=======
@@ -1982,14 +1984,14 @@
>>>>>>> 051c15d (build updates for latest upstream)
fprintf(stderr, "received:\n"); fprintf(stderr, "received:\n");
hexdump(data, dlen); hexdump(data, dlen);
fprintf(stderr, "test data:\n"); fprintf(stderr, "test data:\n");
@ -39,7 +53,11 @@
if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
FAIL("failed to parse server SNI\n"); FAIL("failed to parse server SNI\n");
goto err; goto err;
<<<<<<< HEAD
@@ -3194,7 +3196,10 @@ unsigned char tlsext_clienthello_default[] = { @@ -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, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
}; };
@ -51,7 +69,11 @@
static int static int
test_tlsext_clienthello_build(void) test_tlsext_clienthello_build(void)
<<<<<<< HEAD
@@ -3280,18 +3285,18 @@ test_tlsext_clienthello_build(void) @@ -3280,18 +3285,18 @@ test_tlsext_clienthello_build(void)
=======
@@ -3282,18 +3287,18 @@
>>>>>>> 051c15d (build updates for latest upstream)
goto err; goto err;
} }

1
ssl/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(
tls_buffer.c tls_buffer.c
tls_content.c tls_content.c
tls_key_share.c tls_key_share.c
tls_lib.c
tls12_key_schedule.c tls12_key_schedule.c
tls12_lib.c tls12_lib.c
tls12_record_layer.c tls12_record_layer.c

1
ssl/Makefile.am
View File

@ -76,6 +76,7 @@ libssl_la_SOURCES += t1_lib.c
libssl_la_SOURCES += tls_buffer.c libssl_la_SOURCES += tls_buffer.c
libssl_la_SOURCES += tls_content.c libssl_la_SOURCES += tls_content.c
libssl_la_SOURCES += tls_key_share.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_key_schedule.c
libssl_la_SOURCES += tls12_lib.c libssl_la_SOURCES += tls12_lib.c
libssl_la_SOURCES += tls12_record_layer.c libssl_la_SOURCES += tls12_record_layer.c

11
tests/CMakeLists.txt
View File

@ -413,6 +413,17 @@ else()
endif() endif()
set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") 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 # randtest
add_executable(randtest randtest.c) add_executable(randtest randtest.c)
target_link_libraries(randtest ${OPENSSL_TEST_LIBS}) target_link_libraries(randtest ${OPENSSL_TEST_LIBS})

6
tests/Makefile.am
View File

@ -425,6 +425,12 @@ pq_test_SOURCES = pq_test.c
EXTRA_DIST += pq_test.sh pq_test.bat EXTRA_DIST += pq_test.sh pq_test.bat
EXTRA_DIST += pq_expected.txt EXTRA_DIST += pq_expected.txt
# quictest
TESTS += quictest.sh
check_PROGRAMS += quictest
quictest_SOURCES = quictest.c
EXTRA_DIST += quictest.sh quictest.bat
# randtest # randtest
TESTS += randtest TESTS += randtest
check_PROGRAMS += randtest check_PROGRAMS += randtest

14
tests/quictest.bat Normal file
View File

@ -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

13
tests/quictest.sh Executable file
View File

@ -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