diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libssl/test/testssl | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/test/testssl')
| -rw-r--r-- | src/lib/libssl/test/testssl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/libssl/test/testssl b/src/lib/libssl/test/testssl index b55364ae88..5ae4dc8720 100644 --- a/src/lib/libssl/test/testssl +++ b/src/lib/libssl/test/testssl | |||
| @@ -148,4 +148,14 @@ $ssltest -tls1 -cipher PSK -psk abc123 $extra || exit 1 | |||
| 148 | echo test tls1 with PSK via BIO pair | 148 | echo test tls1 with PSK via BIO pair |
| 149 | $ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1 | 149 | $ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1 |
| 150 | 150 | ||
| 151 | if ../util/shlib_wrap.sh ../apps/openssl no-srp; then | ||
| 152 | echo skipping SRP tests | ||
| 153 | else | ||
| 154 | echo test tls1 with SRP | ||
| 155 | $ssltest -tls1 -cipher SRP -srpuser test -srppass abc123 | ||
| 156 | |||
| 157 | echo test tls1 with SRP via BIO pair | ||
| 158 | $ssltest -bio_pair -tls1 -cipher SRP -srpuser test -srppass abc123 | ||
| 159 | fi | ||
| 160 | |||
| 151 | exit 0 | 161 | exit 0 |