add key_schedule test, tls13 key schedule bits

5 files changed, 13 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 3c0d035..cfa91cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ tests/cipher*
 tests/explicit_bzero*
 tests/freenull*
 tests/gost2814789t*
+tests/key_schedule*
 tests/mont*
 tests/rfc5280time*
 tests/ssl_versions*
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 5c13e5d..b790fb4 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -36,6 +36,7 @@ set(
         t1_enc.c
         t1_hash.c
         t1_lib.c
+        tls13_key_schedule.c
 )
 
 add_library(ssl ${SSL_SRC})
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 8263749..8e8d1c8 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -45,8 +45,10 @@ libssl_la_SOURCES += ssl_versions.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_hash.c
 libssl_la_SOURCES += t1_lib.c
+libssl_la_SOURCES += tls13_key_schedule.c
 
 noinst_HEADERS = srtp.h
 noinst_HEADERS += ssl_locl.h
 noinst_HEADERS += ssl_tlsext.h
 noinst_HEADERS += bytestring.h
+noinst_HEADERS += tls13_internal.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a2e2ab3..921bc81 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -227,6 +227,10 @@ add_test(igetest igetest)
 
 # keypairtest
 if(NOT BUILD_SHARED_LIBS)
+        add_executable(key_schedule key_schedule.c)
+        target_link_libraries(key_schedule ${OPENSSL_LIBS})
+        add_test(key_schedule key_schedule)
+
         add_executable(keypairtest keypairtest.c)
         target_link_libraries(keypairtest ${OPENSSL_LIBS})
         add_test(keypairtest keypairtest
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7373cd6..ca0c5bb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -236,6 +236,11 @@ check_PROGRAMS += keypairtest
 keypairtest_SOURCES = keypairtest.c
 EXTRA_DIST += keypairtest.sh
 
+# key_schedule
+TESTS += key_schedule
+check_PROGRAMS += key_schedule
+key_schedule_SOURCES = key_schedule.c
+
 # md4test
 TESTS += md4test
 check_PROGRAMS += md4test