From ff48c0d9098080b51ea12710029135916d117806 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 30 Mar 2010 12:36:28 +0000
Subject: svn merge -r514:HEAD ^/branches/released .

---
 openssl/test/testssl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'openssl/test/testssl')

diff --git a/openssl/test/testssl b/openssl/test/testssl
index 8ac90ae5e..f9d7c5d65 100644
--- a/openssl/test/testssl
+++ b/openssl/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