From 8922d4bc4a8b8893d72a48deb2cdf58215f98505 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 1 Oct 2010 22:59:01 +0000
Subject: resolve conflicts, fix local changes

---
 src/lib/libssl/test/testssl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/lib/libssl/test/testssl')

diff --git a/src/lib/libssl/test/testssl b/src/lib/libssl/test/testssl
index 8ac90ae5ee..f9d7c5d65f 100644
--- a/src/lib/libssl/test/testssl
+++ b/src/lib/libssl/test/testssl
@@ -142,4 +142,10 @@ else
   fi
 fi
 
+echo test tls1 with PSK
+$ssltest -tls1 -cipher PSK -psk abc123 $extra || exit 1
+
+echo test tls1 with PSK via BIO pair
+$ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1
+
 exit 0
-- 
cgit v1.2.3-55-g6feb