From cc613e785e9272db37991ec35785d78f50e0ca15 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 31 Jul 2022 23:31:18 -0500 Subject: updates for new files and test cases --- crypto/CMakeLists.txt | 2 ++ crypto/Makefile.am | 3 +++ ssl/CMakeLists.txt | 1 + ssl/Makefile.am | 1 + tests/CMakeLists.txt | 7 ++++++- tests/Makefile.am | 5 +++++ tests/aeadtest.sh | 8 +++++++- update.sh | 2 +- 8 files changed, 26 insertions(+), 3 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 2d23332..3f0c603 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -333,6 +333,7 @@ set( bn/bn_add.c bn/bn_asm.c bn/bn_blind.c + bn/bn_bpsw.c bn/bn_const.c bn/bn_ctx.c bn/bn_depr.c @@ -342,6 +343,7 @@ set( bn/bn_exp2.c bn/bn_gcd.c bn/bn_gf2m.c + bn/bn_isqrt.c bn/bn_kron.c bn/bn_lib.c bn/bn_mod.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index b78f491..9b36724 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -412,6 +412,7 @@ noinst_HEADERS += bio/bio_local.h libcrypto_la_SOURCES += bn/bn_add.c libcrypto_la_SOURCES += bn/bn_asm.c libcrypto_la_SOURCES += bn/bn_blind.c +libcrypto_la_SOURCES += bn/bn_bpsw.c libcrypto_la_SOURCES += bn/bn_const.c libcrypto_la_SOURCES += bn/bn_ctx.c libcrypto_la_SOURCES += bn/bn_depr.c @@ -421,6 +422,7 @@ libcrypto_la_SOURCES += bn/bn_exp.c libcrypto_la_SOURCES += bn/bn_exp2.c libcrypto_la_SOURCES += bn/bn_gcd.c libcrypto_la_SOURCES += bn/bn_gf2m.c +libcrypto_la_SOURCES += bn/bn_isqrt.c libcrypto_la_SOURCES += bn/bn_kron.c libcrypto_la_SOURCES += bn/bn_lib.c libcrypto_la_SOURCES += bn/bn_mod.c @@ -927,6 +929,7 @@ libcrypto_la_SOURCES += ts/ts_rsp_sign.c libcrypto_la_SOURCES += ts/ts_rsp_utils.c libcrypto_la_SOURCES += ts/ts_rsp_verify.c libcrypto_la_SOURCES += ts/ts_verify_ctx.c +noinst_HEADERS += ts/ts_local.h # txt_db libcrypto_la_SOURCES += txt_db/txt_db.c diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 07636ad..e4af7ca 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -47,6 +47,7 @@ set( tls13_key_schedule.c tls13_legacy.c tls13_lib.c + tls13_quic.c tls13_record.c tls13_record_layer.c tls13_server.c diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 9cf3839..42b548c 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -86,6 +86,7 @@ libssl_la_SOURCES += tls13_handshake_msg.c libssl_la_SOURCES += tls13_key_schedule.c libssl_la_SOURCES += tls13_legacy.c libssl_la_SOURCES += tls13_lib.c +libssl_la_SOURCES += tls13_quic.c libssl_la_SOURCES += tls13_record.c libssl_la_SOURCES += tls13_record_layer.c libssl_la_SOURCES += tls13_server.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e6cb2bc..efa6e04 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -21,7 +21,12 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR) # aeadtest add_executable(aeadtest aeadtest.c) target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS}) -add_test(aeadtest aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt) +if(NOT WIN32) + add_test(NAME aeadtest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/aeadtest.sh) + set_tests_properties(aeadtest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") +else() + add_test(aeadtest aeadtest aead ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt) +endif() # aes_wrap add_executable(aes_wrap aes_wrap.c) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f768e2..3be2f3f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,6 +34,11 @@ check_PROGRAMS += aeadtest aeadtest_SOURCES = aeadtest.c EXTRA_DIST += aeadtest.sh EXTRA_DIST += aeadtests.txt +EXTRA_DIST += aes_128_gcm_tests.txt +EXTRA_DIST += aes_192_gcm_tests.txt +EXTRA_DIST += aes_256_gcm_tests.txt +EXTRA_DIST += chacha20_poly1305_tests.txt +EXTRA_DIST += xchacha20_poly1305_tests.txt # aes_wrap TESTS += aes_wrap diff --git a/tests/aeadtest.sh b/tests/aeadtest.sh index 132b1fd..9f59595 100755 --- a/tests/aeadtest.sh +++ b/tests/aeadtest.sh @@ -4,4 +4,10 @@ TEST=./aeadtest if [ -e ./aeadtest.exe ]; then TEST=./aeadtest.exe fi -$TEST $srcdir/aeadtests.txt +$TEST aead $srcdir/aeadtests.txt +$TEST aes-128-gcm $srcdir/aes_128_gcm_tests.txt +$TEST aes-192-gcm $srcdir/aes_192_gcm_tests.txt +$TEST aes-256-gcm $srcdir/aes_256_gcm_tests.txt +$TEST chacha20-poly1305 $srcdir/chacha20_poly1305_tests.txt +$TEST xchacha20-poly1305 $srcdir/xchacha20_poly1305_tests.txt + diff --git a/update.sh b/update.sh index 2f325ca..3aea129 100755 --- a/update.sh +++ b/update.sh @@ -288,7 +288,7 @@ for i in `find $libcrypto_regress -name '*.c'`; do $CP "$i" tests done $CP $libcrypto_regress/evp/evptests.txt tests -$CP $libcrypto_regress/aead/aeadtests.txt tests +$CP $libcrypto_regress/aead/*.txt tests # generate libcrypto freenull.c awk -f $libcrypto_regress/free/freenull.awk \ -- cgit v1.2.3-55-g6feb