updates for new files and test cases

This commit is contained in:
Brent Cook 2022-07-31 23:31:18 -05:00
parent 5f5feb2bbc
commit cc613e785e
8 changed files with 26 additions and 3 deletions

View File

@ -333,6 +333,7 @@ set(
bn/bn_add.c bn/bn_add.c
bn/bn_asm.c bn/bn_asm.c
bn/bn_blind.c bn/bn_blind.c
bn/bn_bpsw.c
bn/bn_const.c bn/bn_const.c
bn/bn_ctx.c bn/bn_ctx.c
bn/bn_depr.c bn/bn_depr.c
@ -342,6 +343,7 @@ set(
bn/bn_exp2.c bn/bn_exp2.c
bn/bn_gcd.c bn/bn_gcd.c
bn/bn_gf2m.c bn/bn_gf2m.c
bn/bn_isqrt.c
bn/bn_kron.c bn/bn_kron.c
bn/bn_lib.c bn/bn_lib.c
bn/bn_mod.c bn/bn_mod.c

View File

@ -412,6 +412,7 @@ noinst_HEADERS += bio/bio_local.h
libcrypto_la_SOURCES += bn/bn_add.c libcrypto_la_SOURCES += bn/bn_add.c
libcrypto_la_SOURCES += bn/bn_asm.c libcrypto_la_SOURCES += bn/bn_asm.c
libcrypto_la_SOURCES += bn/bn_blind.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_const.c
libcrypto_la_SOURCES += bn/bn_ctx.c libcrypto_la_SOURCES += bn/bn_ctx.c
libcrypto_la_SOURCES += bn/bn_depr.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_exp2.c
libcrypto_la_SOURCES += bn/bn_gcd.c libcrypto_la_SOURCES += bn/bn_gcd.c
libcrypto_la_SOURCES += bn/bn_gf2m.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_kron.c
libcrypto_la_SOURCES += bn/bn_lib.c libcrypto_la_SOURCES += bn/bn_lib.c
libcrypto_la_SOURCES += bn/bn_mod.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_utils.c
libcrypto_la_SOURCES += ts/ts_rsp_verify.c libcrypto_la_SOURCES += ts/ts_rsp_verify.c
libcrypto_la_SOURCES += ts/ts_verify_ctx.c libcrypto_la_SOURCES += ts/ts_verify_ctx.c
noinst_HEADERS += ts/ts_local.h
# txt_db # txt_db
libcrypto_la_SOURCES += txt_db/txt_db.c libcrypto_la_SOURCES += txt_db/txt_db.c

View File

@ -47,6 +47,7 @@ set(
tls13_key_schedule.c tls13_key_schedule.c
tls13_legacy.c tls13_legacy.c
tls13_lib.c tls13_lib.c
tls13_quic.c
tls13_record.c tls13_record.c
tls13_record_layer.c tls13_record_layer.c
tls13_server.c tls13_server.c

View File

@ -86,6 +86,7 @@ libssl_la_SOURCES += tls13_handshake_msg.c
libssl_la_SOURCES += tls13_key_schedule.c libssl_la_SOURCES += tls13_key_schedule.c
libssl_la_SOURCES += tls13_legacy.c libssl_la_SOURCES += tls13_legacy.c
libssl_la_SOURCES += tls13_lib.c libssl_la_SOURCES += tls13_lib.c
libssl_la_SOURCES += tls13_quic.c
libssl_la_SOURCES += tls13_record.c libssl_la_SOURCES += tls13_record.c
libssl_la_SOURCES += tls13_record_layer.c libssl_la_SOURCES += tls13_record_layer.c
libssl_la_SOURCES += tls13_server.c libssl_la_SOURCES += tls13_server.c

View File

@ -21,7 +21,12 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR)
# aeadtest # aeadtest
add_executable(aeadtest aeadtest.c) add_executable(aeadtest aeadtest.c)
target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS}) 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 # aes_wrap
add_executable(aes_wrap aes_wrap.c) add_executable(aes_wrap aes_wrap.c)

View File

@ -34,6 +34,11 @@ check_PROGRAMS += aeadtest
aeadtest_SOURCES = aeadtest.c aeadtest_SOURCES = aeadtest.c
EXTRA_DIST += aeadtest.sh EXTRA_DIST += aeadtest.sh
EXTRA_DIST += aeadtests.txt 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 # aes_wrap
TESTS += aes_wrap TESTS += aes_wrap

View File

@ -4,4 +4,10 @@ TEST=./aeadtest
if [ -e ./aeadtest.exe ]; then if [ -e ./aeadtest.exe ]; then
TEST=./aeadtest.exe TEST=./aeadtest.exe
fi 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

View File

@ -288,7 +288,7 @@ for i in `find $libcrypto_regress -name '*.c'`; do
$CP "$i" tests $CP "$i" tests
done done
$CP $libcrypto_regress/evp/evptests.txt tests $CP $libcrypto_regress/evp/evptests.txt tests
$CP $libcrypto_regress/aead/aeadtests.txt tests $CP $libcrypto_regress/aead/*.txt tests
# generate libcrypto freenull.c # generate libcrypto freenull.c
awk -f $libcrypto_regress/free/freenull.awk \ awk -f $libcrypto_regress/free/freenull.awk \