summaryrefslogtreecommitdiffstats
path: root/test/testssl
diff options
context:
space:
mode:
authorTrevor <unsafe@trevp.net>2013-06-13 22:36:45 -0700
committerBen Laurie <ben@links.org>2013-06-18 16:13:08 +0100
commit9cd50f738ff55eae2a64f872492d3a7ce115f18d (patch)
treeff3b9868dd02aa7b632d82a8f9ff9f7c0d8ebc18 /test/testssl
parent8ee3c7e676c5edb1d5fbe0d66b7ce307a4f92899 (diff)
Cleanup of custom extension stuff.
serverinfo rejects non-empty extensions. Omit extension if no relevant serverinfo data. Improve error-handling in serverinfo callback. Cosmetic cleanups. s_client documentation. s_server documentation. SSL_CTX_serverinfo documentation. Cleaup -1 and NULL callback handling for custom extensions, add tests. Cleanup ssl_rsa.c serverinfo code. Whitespace cleanup. Improve comments in ssl.h for serverinfo. Whitespace. Cosmetic cleanup. Reject non-zero-len serverinfo extensions. Whitespace. Make it build.
Diffstat (limited to 'test/testssl')
-rw-r--r--test/testssl9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/testssl b/test/testssl
index 61416885b1..71524a0663 100644
--- a/test/testssl
+++ b/test/testssl
@@ -179,12 +179,21 @@ $ssltest -bio_pair -tls1 -npn_client -npn_server -num 2 || exit 1
$ssltest -bio_pair -tls1 -npn_client -npn_server -num 2 -reuse || exit 1
#############################################################################
+# Custom Extension tests
+
+echo test tls1 with custom extensions
+$ssltest -bio_pair -tls1 -custom_ext || exit 1
+
+#############################################################################
# Serverinfo tests
+echo test tls1 with serverinfo
$ssltest -bio_pair -tls1 -serverinfo_file $serverinfo || exit 1
$ssltest -bio_pair -tls1 -serverinfo_file $serverinfo -serverinfo_sct || exit 1
$ssltest -bio_pair -tls1 -serverinfo_file $serverinfo -serverinfo_tack || exit 1
$ssltest -bio_pair -tls1 -serverinfo_file $serverinfo -serverinfo_sct -serverinfo_tack || exit 1
+$ssltest -bio_pair -tls1 -custom_ext -serverinfo_file $serverinfo -serverinfo_sct -serverinfo_tack || exit 1
+
if ../util/shlib_wrap.sh ../apps/openssl no-srp; then
echo skipping SRP tests