update for latest changes

5 files changed, 19 insertions, 5 deletions

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index cec2417..07636ad 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -23,6 +23,7 @@ set(
         ssl_packet.c
         ssl_pkt.c
         ssl_rsa.c
+        ssl_seclevel.c
         ssl_sess.c
         ssl_sigalgs.c
         ssl_srvr.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 7eb0ccd..9cf3839 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -62,6 +62,7 @@ libssl_la_SOURCES += ssl_methods.c
 libssl_la_SOURCES += ssl_packet.c
 libssl_la_SOURCES += ssl_pkt.c
 libssl_la_SOURCES += ssl_rsa.c
+libssl_la_SOURCES += ssl_seclevel.c
 libssl_la_SOURCES += ssl_sess.c
 libssl_la_SOURCES += ssl_sigalgs.c
 libssl_la_SOURCES += ssl_srvr.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f2510c..5f768e2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -518,7 +518,19 @@ TESTS += ssltest.sh
 check_PROGRAMS += ssltest
 ssltest_SOURCES = ssltest.c
 EXTRA_DIST += ssltest.sh ssltest.bat
-EXTRA_DIST += testssl testssl.bat ca.pem server.pem
+EXTRA_DIST += testssl testssl.bat
+EXTRA_DIST += ca-int-ecdsa.crl ca-int-ecdsa.pem ca-int-rsa.crl ca-int-rsa.pem
+EXTRA_DIST += ca-root-ecdsa.pem ca-root-rsa.pem ca.pem client.pem
+EXTRA_DIST += client1-ecdsa-chain.pem client1-ecdsa.pem client1-rsa-chain.pem
+EXTRA_DIST += client1-rsa.pem client2-ecdsa-chain.pem client2-ecdsa.pem
+EXTRA_DIST += client2-rsa-chain.pem client2-rsa.pem client3-ecdsa-chain.pem
+EXTRA_DIST += client3-ecdsa.pem client3-rsa-chain.pem client3-rsa.pem
+EXTRA_DIST += server.pem server1-ecdsa-chain.pem server1-ecdsa.pem
+EXTRA_DIST += server1-rsa-chain.pem server1-rsa.pem server2-ecdsa-chain.pem
+EXTRA_DIST += server2-ecdsa.pem server2-rsa-chain.pem server2-rsa.pem
+EXTRA_DIST += server3-ecdsa-chain.pem server3-ecdsa.pem server3-rsa-chain.pem
+EXTRA_DIST += server3-rsa.pem
+
 
 # string_table
 TESTS += string_table
diff --git a/tests/ssltest.sh b/tests/ssltest.sh
index 28da3ac..4283501 100755
--- a/tests/ssltest.sh
+++ b/tests/ssltest.sh
@@ -22,5 +22,5 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$srcdir/testssl $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem \
-        $ssltest_bin $openssl_bin
+$srcdir/testssl $srcdir/server1-rsa.pem $srcdir/server1-rsa-chain.pem $srcdir/ca-root-rsa.pem
+
diff --git a/update.sh b/update.sh
index 717c6ff..2f325ca 100755
--- a/update.sh
+++ b/update.sh
@@ -309,8 +309,8 @@ for i in `find $libssl_regress -name '*.c'`; do
          $CP "$i" tests
 done
 $CP $libssl_regress/unit/tests.h tests
-$CP $libssl_regress/certs/ca.pem tests
-$CP $libssl_regress/certs/server.pem tests
+$CP $libssl_regress/certs/*.pem tests
+$CP $libssl_regress/certs/*.crl tests
 $CP $libssl_regress/pqueue/expected.txt tests/pq_expected.txt
 
 # copy libtls tests