head	1.2;
access;
symbols
	RELENG_8_4:1.2.0.2
	RELENG_9_1_0_RELEASE:1.1.1.4
	RELENG_9_1:1.1.1.4.0.28
	RELENG_9_1_BP:1.1.1.4
	RELENG_8_3_0_RELEASE:1.1.1.4
	RELENG_8_3:1.1.1.4.0.26
	RELENG_8_3_BP:1.1.1.4
	RELENG_9_0_0_RELEASE:1.1.1.4
	RELENG_9_0:1.1.1.4.0.24
	RELENG_9_0_BP:1.1.1.4
	RELENG_9:1.1.1.4.0.22
	RELENG_9_BP:1.1.1.4
	RELENG_7_4_0_RELEASE:1.1.1.4
	RELENG_8_2_0_RELEASE:1.1.1.4
	RELENG_7_4:1.1.1.4.0.20
	RELENG_7_4_BP:1.1.1.4
	RELENG_8_2:1.1.1.4.0.18
	RELENG_8_2_BP:1.1.1.4
	RELENG_8_1_0_RELEASE:1.1.1.4
	RELENG_8_1:1.1.1.4.0.16
	RELENG_8_1_BP:1.1.1.4
	RELENG_7_3_0_RELEASE:1.1.1.4
	RELENG_7_3:1.1.1.4.0.14
	RELENG_7_3_BP:1.1.1.4
	RELENG_8_0_0_RELEASE:1.1.1.4
	RELENG_8_0:1.1.1.4.0.12
	RELENG_8_0_BP:1.1.1.4
	RELENG_8:1.1.1.4.0.10
	RELENG_8_BP:1.1.1.4
	RELENG_7_2_0_RELEASE:1.1.1.4
	RELENG_7_2:1.1.1.4.0.8
	RELENG_7_2_BP:1.1.1.4
	RELENG_7_1_0_RELEASE:1.1.1.4
	RELENG_6_4_0_RELEASE:1.1.1.3
	RELENG_7_1:1.1.1.4.0.6
	RELENG_7_1_BP:1.1.1.4
	RELENG_6_4:1.1.1.3.0.24
	RELENG_6_4_BP:1.1.1.3
	RELENG_7_0_0_RELEASE:1.1.1.4
	RELENG_6_3_0_RELEASE:1.1.1.3
	RELENG_7_0:1.1.1.4.0.4
	RELENG_7_0_BP:1.1.1.4
	RELENG_6_3:1.1.1.3.0.22
	RELENG_6_3_BP:1.1.1.3
	RELENG_7:1.1.1.4.0.2
	RELENG_7_BP:1.1.1.4
	v0_9_8e:1.1.1.4
	RELENG_6_2_0_RELEASE:1.1.1.3
	RELENG_6_2:1.1.1.3.0.20
	RELENG_6_2_BP:1.1.1.3
	v0_9_8d:1.1.1.4
	v0_9_8b:1.1.1.4
	RELENG_5_5_0_RELEASE:1.1.1.3
	RELENG_5_5:1.1.1.3.0.18
	RELENG_5_5_BP:1.1.1.3
	RELENG_6_1_0_RELEASE:1.1.1.3
	RELENG_6_1:1.1.1.3.0.16
	RELENG_6_1_BP:1.1.1.3
	RELENG_6_0_0_RELEASE:1.1.1.3
	RELENG_6_0:1.1.1.3.0.14
	RELENG_6_0_BP:1.1.1.3
	RELENG_6:1.1.1.3.0.12
	RELENG_6_BP:1.1.1.3
	RELENG_5_4_0_RELEASE:1.1.1.3
	RELENG_5_4:1.1.1.3.0.10
	RELENG_5_4_BP:1.1.1.3
	v0_9_7e:1.1.1.3
	RELENG_4_11_0_RELEASE:1.1.1.1.2.2
	RELENG_4_11:1.1.1.1.2.2.0.8
	RELENG_4_11_BP:1.1.1.1.2.2
	RELENG_5_3_0_RELEASE:1.1.1.3
	RELENG_5_3:1.1.1.3.0.8
	RELENG_5_3_BP:1.1.1.3
	RELENG_5:1.1.1.3.0.6
	RELENG_5_BP:1.1.1.3
	RELENG_4_10_0_RELEASE:1.1.1.1.2.2
	RELENG_4_10:1.1.1.1.2.2.0.6
	RELENG_4_10_BP:1.1.1.1.2.2
	v0_9_7d:1.1.1.3
	RELENG_5_2_1_RELEASE:1.1.1.3
	RELENG_5_2_0_RELEASE:1.1.1.3
	RELENG_5_2:1.1.1.3.0.4
	RELENG_5_2_BP:1.1.1.3
	RELENG_4_9_0_RELEASE:1.1.1.1.2.2
	RELENG_4_9:1.1.1.1.2.2.0.4
	RELENG_4_9_BP:1.1.1.1.2.2
	v0_9_7c:1.1.1.3
	RELENG_5_1_0_RELEASE:1.1.1.3
	RELENG_5_1:1.1.1.3.0.2
	RELENG_5_1_BP:1.1.1.3
	RELENG_4_8_0_RELEASE:1.1.1.1.2.2
	RELENG_4_8:1.1.1.1.2.2.0.2
	RELENG_4_8_BP:1.1.1.1.2.2
	v0_9_7a:1.1.1.3
	v0_9_7:1.1.1.3
	RELENG_5_0_0_RELEASE:1.1.1.2
	RELENG_5_0:1.1.1.2.0.2
	RELENG_5_0_BP:1.1.1.2
	RELENG_4_7_0_RELEASE:1.1.1.1.2.1
	RELENG_4_7:1.1.1.1.2.1.0.10
	RELENG_4_7_BP:1.1.1.1.2.1
	RELENG_4_6_2_RELEASE:1.1.1.1.2.1
	v0_9_6g:1.1.1.2
	v0_9_6f:1.1.1.2
	v0_9_6e:1.1.1.2
	v0_9_6d:1.1.1.2
	RELENG_4_6_1_RELEASE:1.1.1.1.2.1
	RELENG_4_6_0_RELEASE:1.1.1.1.2.1
	RELENG_4_6:1.1.1.1.2.1.0.8
	RELENG_4_6_BP:1.1.1.1.2.1
	RELENG_4_5_0_RELEASE:1.1.1.1.2.1
	v0_9_6c:1.1.1.2
	RELENG_4_5:1.1.1.1.2.1.0.6
	RELENG_4_5_BP:1.1.1.1.2.1
	RELENG_4_4_0_RELEASE:1.1.1.1.2.1
	RELENG_4_4:1.1.1.1.2.1.0.4
	RELENG_4_4_BP:1.1.1.1.2.1
	v0_9_6b:1.1.1.2
	v0_9_6a:1.1.1.2
	RELENG_4_3_0_RELEASE:1.1.1.1.2.1
	RELENG_4_3:1.1.1.1.2.1.0.2
	RELENG_4_3_BP:1.1.1.1.2.1
	v0_9_6_2001_02_10:1.1.1.2
	RELENG_4_2_0_RELEASE:1.1.1.1.2.1
	v0_9_6:1.1.1.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	PRE_SMPNG:1.1.1.2
	RELENG_4_1_0_RELEASE:1.1.1.1
	v0_9_5a:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v0_9_4:1.1.1.1
	OPENSSL:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2012.07.12.19.30.53;	author jkim;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.01.10.06.22.02;	author kris;	state Exp;
branches
	1.1.1.1;
next	;

1.2.2.1
date	2012.07.12.19.30.53;	author svnexp;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2013.03.28.13.02.40;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	2000.01.10.06.22.02;	author kris;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.04.13.06.32.53;	author kris;	state Exp;
branches
	1.1.1.2.2.1;
next	1.1.1.3;

1.1.1.3
date	2003.01.28.21.39.58;	author markm;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2006.07.29.19.10.21;	author simon;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2000.08.20.08.47.04;	author kris;	state Exp;
branches
	1.1.1.1.2.1.8.1
	1.1.1.1.2.1.10.1;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2003.02.14.22.38.12;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.1.8.1
date	2003.02.21.16.33.01;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.1.10.1
date	2003.02.20.20.42.20;	author nectar;	state Exp;
branches;
next	;

1.1.1.2.2.1
date	2003.02.20.17.14.22;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 238405 on 2012-07-12 19:30:53Z by jkim

Merge OpenSSL 1.0.1c.

Approved by:	benl (maintainer)
@
text
@#!/bin/sh

echo test sslv2
./ssltest -ssl2 || exit 1

echo test sslv2 with server authentication
./ssltest -ssl2 -server_auth -CApath ../certs || exit 1

echo test sslv2 with client authentication
./ssltest -ssl2 -client_auth -CApath ../certs || exit 1

echo test sslv2 with both client and server authentication
./ssltest -ssl2 -server_auth -client_auth -CApath ../certs || exit 1

echo test sslv3
./ssltest -ssl3 || exit 1

echo test sslv3 with server authentication
./ssltest -ssl3 -server_auth -CApath ../certs || exit 1

echo test sslv3 with client authentication
./ssltest -ssl3 -client_auth -CApath ../certs || exit 1

echo test sslv3 with both client and server authentication
./ssltest -ssl3 -server_auth -client_auth -CApath ../certs || exit 1

echo test sslv2/sslv3
./ssltest || exit 1

echo test sslv2/sslv3 with server authentication
./ssltest -server_auth -CApath ../certs || exit 1

echo test sslv2/sslv3 with client authentication
./ssltest -client_auth -CApath ../certs || exit 1

echo test sslv2/sslv3 with both client and server authentication
./ssltest -server_auth -client_auth -CApath ../certs || exit 1

echo test sslv2 via BIO pair
./ssltest -bio_pair -ssl2 || exit 1

echo test sslv2 with server authentication via BIO pair
./ssltest -bio_pair -ssl2 -server_auth -CApath ../certs || exit 1

echo test sslv2 with client authentication via BIO pair
./ssltest -bio_pair -ssl2 -client_auth -CApath ../certs || exit 1

echo test sslv2 with both client and server authentication via BIO pair
./ssltest -bio_pair -ssl2 -server_auth -client_auth -CApath ../certs || exit 1

echo test sslv3 via BIO pair
./ssltest -bio_pair -ssl3 || exit 1

echo test sslv3 with server authentication via BIO pair
./ssltest -bio_pair -ssl3 -server_auth -CApath ../certs || exit 1

echo test sslv3 with client authentication via BIO pair
./ssltest -bio_pair -ssl3 -client_auth -CApath ../certs || exit 1

echo test sslv3 with both client and server authentication via BIO pair
./ssltest -bio_pair -ssl3 -server_auth -client_auth -CApath ../certs || exit 1

echo test sslv2/sslv3 via BIO pair
./ssltest || exit 1

echo test sslv2/sslv3 with server authentication
./ssltest -bio_pair -server_auth -CApath ../certs || exit 1

echo test sslv2/sslv3 with client authentication via BIO pair
./ssltest -bio_pair -client_auth -CApath ../certs || exit 1

echo test sslv2/sslv3 with both client and server authentication via BIO pair
./ssltest -bio_pair -server_auth -client_auth -CApath ../certs || exit 1

exit 0
@


1.2.2.1
log
@file testssl was added on branch RELENG_8_4 on 2013-03-28 13:02:40 +0000
@
text
@d1 75
@


1.2.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 145
#!/bin/sh

if [ "$1" = "" ]; then
  key=../apps/server.pem
else
  key="$1"
fi
if [ "$2" = "" ]; then
  cert=../apps/server.pem
else
  cert="$2"
fi
ssltest="../util/shlib_wrap.sh ./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"

if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
  dsa_cert=YES
else
  dsa_cert=NO
fi

if [ "$3" = "" ]; then
  CA="-CApath ../certs"
else
  CA="-CAfile $3"
fi

if [ "$4" = "" ]; then
  extra=""
else
  extra="$4"
fi

#############################################################################

echo test sslv2
$ssltest -ssl2 $extra || exit 1

echo test sslv2 with server authentication
$ssltest -ssl2 -server_auth $CA $extra || exit 1

if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication
  $ssltest -ssl2 -client_auth $CA $extra || exit 1

  echo test sslv2 with both client and server authentication
  $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1
fi

echo test sslv3
$ssltest -ssl3 $extra || exit 1

echo test sslv3 with server authentication
$ssltest -ssl3 -server_auth $CA $extra || exit 1

echo test sslv3 with client authentication
$ssltest -ssl3 -client_auth $CA $extra || exit 1

echo test sslv3 with both client and server authentication
$ssltest -ssl3 -server_auth -client_auth $CA $extra || exit 1

echo test sslv2/sslv3
$ssltest $extra || exit 1

echo test sslv2/sslv3 with server authentication
$ssltest -server_auth $CA $extra || exit 1

echo test sslv2/sslv3 with client authentication
$ssltest -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 with both client and server authentication
$ssltest -server_auth -client_auth $CA $extra || exit 1

echo test sslv2 via BIO pair
$ssltest -bio_pair -ssl2 $extra || exit 1

echo test sslv2 with server authentication via BIO pair
$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1

if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication via BIO pair
  $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1

  echo test sslv2 with both client and server authentication via BIO pair
  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1
fi

echo test sslv3 via BIO pair
$ssltest -bio_pair -ssl3 $extra || exit 1

echo test sslv3 with server authentication via BIO pair
$ssltest -bio_pair -ssl3 -server_auth $CA $extra || exit 1

echo test sslv3 with client authentication via BIO pair
$ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1

echo test sslv3 with both client and server authentication via BIO pair
$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 via BIO pair
$ssltest $extra || exit 1

if [ $dsa_cert = NO ]; then
  echo test sslv2/sslv3 w/o DHE via BIO pair
  $ssltest -bio_pair -no_dhe $extra || exit 1
fi

echo test sslv2/sslv3 with 1024bit DHE via BIO pair
$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1

echo test sslv2/sslv3 with server authentication
$ssltest -bio_pair -server_auth $CA $extra || exit 1

echo test sslv2/sslv3 with client authentication via BIO pair
$ssltest -bio_pair -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 with both client and server authentication via BIO pair
$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1

#############################################################################

if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
fi

if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
  echo skipping RSA tests
else
  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
  ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1

  if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
  fi
fi

exit 0
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
@
text
@@


1.1.1.1.2.1
log
@MFC: OpenSSL 0.9.5a
@
text
@a2 26
if [ "$1" = "" ]; then
  key=../apps/server.pem
else
  key="$1"
fi
if [ "$2" = "" ]; then
  cert=../apps/server.pem
else
  cert="$2"
fi
ssltest="./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"

if ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
  dsa_cert=YES
else
  dsa_cert=NO
fi

if [ "$3" = "" ]; then
  CA="-CApath ../certs"
else
  CA="-CAfile $3"
fi

#############################################################################

d4 1
a4 1
$ssltest -ssl2 || exit 1
d7 4
a10 1
$ssltest -ssl2 -server_auth $CA || exit 1
d12 2
a13 7
if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication
  $ssltest -ssl2 -client_auth $CA || exit 1

  echo test sslv2 with both client and server authentication
  $ssltest -ssl2 -server_auth -client_auth $CA || exit 1
fi
d16 1
a16 1
$ssltest -ssl3 || exit 1
d19 1
a19 1
$ssltest -ssl3 -server_auth $CA || exit 1
d22 1
a22 1
$ssltest -ssl3 -client_auth $CA || exit 1
d25 1
a25 1
$ssltest -ssl3 -server_auth -client_auth $CA || exit 1
d28 1
a28 1
$ssltest || exit 1
d31 1
a31 1
$ssltest -server_auth $CA || exit 1
d34 1
a34 1
$ssltest -client_auth $CA || exit 1
d37 1
a37 1
$ssltest -server_auth -client_auth $CA || exit 1
d40 1
a40 1
$ssltest -bio_pair -ssl2 || exit 1
d43 1
a43 1
$ssltest -bio_pair -ssl2 -server_auth $CA || exit 1
d45 5
a49 7
if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication via BIO pair
  $ssltest -bio_pair -ssl2 -client_auth $CA || exit 1

  echo test sslv2 with both client and server authentication via BIO pair
  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA || exit 1
fi
d52 1
a52 1
$ssltest -bio_pair -ssl3 || exit 1
d55 1
a55 1
$ssltest -bio_pair -ssl3 -server_auth $CA || exit 1
d58 1
a58 1
$ssltest -bio_pair -ssl3 -client_auth $CA || exit 1
d61 1
a61 1
$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA || exit 1
d64 1
a64 9
$ssltest || exit 1

if [ $dsa_cert = NO ]; then
  echo test sslv2/sslv3 w/o DHE via BIO pair
  $ssltest -bio_pair -no_dhe || exit 1
fi

echo test sslv2/sslv3 with 1024bit DHE via BIO pair
$ssltest -bio_pair -dhe1024dsa -v || exit 1
d67 1
a67 1
$ssltest -bio_pair -server_auth $CA || exit 1
d70 1
a70 1
$ssltest -bio_pair -client_auth $CA || exit 1
d73 1
a73 16
$ssltest -bio_pair -server_auth -client_auth $CA || exit 1

#############################################################################

echo test tls1 with 1024bit anonymous DH, multiple handshakes
$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1

if ../apps/openssl no-rsa; then
  echo skipping RSA tests
else
  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time || exit 1

  echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1
fi
@


1.1.1.1.2.1.8.1
log
@Merge from RELENG_4_7: Update to OpenSSL 0.9.6i.
@
text
@d115 2
a116 6
if ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1
fi
d124 2
a125 6
  if ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1
  fi
@


1.1.1.1.2.1.10.1
log
@Merge from RELENG_5_0: Update to OpenSSL 0.9.6i.
@
text
@d115 2
a116 6
if ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1
fi
d124 2
a125 6
  if ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1
  fi
@


1.1.1.1.2.2
log
@MFC OpenSSL 0.9.7
@
text
@a26 6
if [ "$4" = "" ]; then
  extra=""
else
  extra="$4"
fi

d30 1
a30 1
$ssltest -ssl2 $extra || exit 1
d33 1
a33 1
$ssltest -ssl2 -server_auth $CA $extra || exit 1
d37 1
a37 1
  $ssltest -ssl2 -client_auth $CA $extra || exit 1
d40 1
a40 1
  $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1
d44 1
a44 1
$ssltest -ssl3 $extra || exit 1
d47 1
a47 1
$ssltest -ssl3 -server_auth $CA $extra || exit 1
d50 1
a50 1
$ssltest -ssl3 -client_auth $CA $extra || exit 1
d53 1
a53 1
$ssltest -ssl3 -server_auth -client_auth $CA $extra || exit 1
d56 1
a56 1
$ssltest $extra || exit 1
d59 1
a59 1
$ssltest -server_auth $CA $extra || exit 1
d62 1
a62 1
$ssltest -client_auth $CA $extra || exit 1
d65 1
a65 1
$ssltest -server_auth -client_auth $CA $extra || exit 1
d68 1
a68 1
$ssltest -bio_pair -ssl2 $extra || exit 1
d71 1
a71 1
$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1
d75 1
a75 1
  $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1
d78 1
a78 1
  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1
d82 1
a82 1
$ssltest -bio_pair -ssl3 $extra || exit 1
d85 1
a85 1
$ssltest -bio_pair -ssl3 -server_auth $CA $extra || exit 1
d88 1
a88 1
$ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1
d91 1
a91 1
$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1
d94 1
a94 1
$ssltest $extra || exit 1
d98 1
a98 1
  $ssltest -bio_pair -no_dhe $extra || exit 1
d102 1
a102 1
$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
d105 1
a105 1
$ssltest -bio_pair -server_auth $CA $extra || exit 1
d108 1
a108 1
$ssltest -bio_pair -client_auth $CA $extra || exit 1
d111 1
a111 4
$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
d115 2
a116 6
if ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
fi
d122 1
a122 1
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
d124 2
a125 6
  if ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
  fi
@


1.1.1.2
log
@Initial import of OpenSSL 0.9.5a
@
text
@a2 26
if [ "$1" = "" ]; then
  key=../apps/server.pem
else
  key="$1"
fi
if [ "$2" = "" ]; then
  cert=../apps/server.pem
else
  cert="$2"
fi
ssltest="./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"

if ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
  dsa_cert=YES
else
  dsa_cert=NO
fi

if [ "$3" = "" ]; then
  CA="-CApath ../certs"
else
  CA="-CAfile $3"
fi

#############################################################################

d4 1
a4 1
$ssltest -ssl2 || exit 1
d7 4
a10 1
$ssltest -ssl2 -server_auth $CA || exit 1
d12 2
a13 7
if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication
  $ssltest -ssl2 -client_auth $CA || exit 1

  echo test sslv2 with both client and server authentication
  $ssltest -ssl2 -server_auth -client_auth $CA || exit 1
fi
d16 1
a16 1
$ssltest -ssl3 || exit 1
d19 1
a19 1
$ssltest -ssl3 -server_auth $CA || exit 1
d22 1
a22 1
$ssltest -ssl3 -client_auth $CA || exit 1
d25 1
a25 1
$ssltest -ssl3 -server_auth -client_auth $CA || exit 1
d28 1
a28 1
$ssltest || exit 1
d31 1
a31 1
$ssltest -server_auth $CA || exit 1
d34 1
a34 1
$ssltest -client_auth $CA || exit 1
d37 1
a37 1
$ssltest -server_auth -client_auth $CA || exit 1
d40 1
a40 1
$ssltest -bio_pair -ssl2 || exit 1
d43 1
a43 1
$ssltest -bio_pair -ssl2 -server_auth $CA || exit 1
d45 5
a49 7
if [ $dsa_cert = NO ]; then
  echo test sslv2 with client authentication via BIO pair
  $ssltest -bio_pair -ssl2 -client_auth $CA || exit 1

  echo test sslv2 with both client and server authentication via BIO pair
  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA || exit 1
fi
d52 1
a52 1
$ssltest -bio_pair -ssl3 || exit 1
d55 1
a55 1
$ssltest -bio_pair -ssl3 -server_auth $CA || exit 1
d58 1
a58 1
$ssltest -bio_pair -ssl3 -client_auth $CA || exit 1
d61 1
a61 1
$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA || exit 1
d64 1
a64 9
$ssltest || exit 1

if [ $dsa_cert = NO ]; then
  echo test sslv2/sslv3 w/o DHE via BIO pair
  $ssltest -bio_pair -no_dhe || exit 1
fi

echo test sslv2/sslv3 with 1024bit DHE via BIO pair
$ssltest -bio_pair -dhe1024dsa -v || exit 1
d67 1
a67 1
$ssltest -bio_pair -server_auth $CA || exit 1
d70 1
a70 1
$ssltest -bio_pair -client_auth $CA || exit 1
d73 1
a73 16
$ssltest -bio_pair -server_auth -client_auth $CA || exit 1

#############################################################################

echo test tls1 with 1024bit anonymous DH, multiple handshakes
$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1

if ../apps/openssl no-rsa; then
  echo skipping RSA tests
else
  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time || exit 1

  echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1
fi
@


1.1.1.2.2.1
log
@Update to OpenSSL 0.9.6i.
@
text
@d115 2
a116 6
if ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1
fi
d124 2
a125 6
  if ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1
  fi
@


1.1.1.3
log
@Vendor import of OpenSSL release 0.9.7. This release includes
support for AES and OpenBSD's hardware crypto.
@
text
@a26 6
if [ "$4" = "" ]; then
  extra=""
else
  extra="$4"
fi

d30 1
a30 1
$ssltest -ssl2 $extra || exit 1
d33 1
a33 1
$ssltest -ssl2 -server_auth $CA $extra || exit 1
d37 1
a37 1
  $ssltest -ssl2 -client_auth $CA $extra || exit 1
d40 1
a40 1
  $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1
d44 1
a44 1
$ssltest -ssl3 $extra || exit 1
d47 1
a47 1
$ssltest -ssl3 -server_auth $CA $extra || exit 1
d50 1
a50 1
$ssltest -ssl3 -client_auth $CA $extra || exit 1
d53 1
a53 1
$ssltest -ssl3 -server_auth -client_auth $CA $extra || exit 1
d56 1
a56 1
$ssltest $extra || exit 1
d59 1
a59 1
$ssltest -server_auth $CA $extra || exit 1
d62 1
a62 1
$ssltest -client_auth $CA $extra || exit 1
d65 1
a65 1
$ssltest -server_auth -client_auth $CA $extra || exit 1
d68 1
a68 1
$ssltest -bio_pair -ssl2 $extra || exit 1
d71 1
a71 1
$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1
d75 1
a75 1
  $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1
d78 1
a78 1
  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1
d82 1
a82 1
$ssltest -bio_pair -ssl3 $extra || exit 1
d85 1
a85 1
$ssltest -bio_pair -ssl3 -server_auth $CA $extra || exit 1
d88 1
a88 1
$ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1
d91 1
a91 1
$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1
d94 1
a94 1
$ssltest $extra || exit 1
d98 1
a98 1
  $ssltest -bio_pair -no_dhe $extra || exit 1
d102 1
a102 1
$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
d105 1
a105 1
$ssltest -bio_pair -server_auth $CA $extra || exit 1
d108 1
a108 1
$ssltest -bio_pair -client_auth $CA $extra || exit 1
d111 1
a111 4
$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1

echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
d115 2
a116 6
if ../apps/openssl no-dh; then
  echo skipping anonymous DH tests
else
  echo test tls1 with 1024bit anonymous DH, multiple handshakes
  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
fi
d122 1
a122 1
  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
d124 2
a125 6
  if ../apps/openssl no-dh; then
    echo skipping RSA+DHE tests
  else
    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
  fi
@


1.1.1.4
log
@Vendor import of OpenSSL 0.9.8b
@
text
@d13 1
a13 1
ssltest="../util/shlib_wrap.sh ./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"
d15 1
a15 1
if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
d124 1
a124 1
if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
d131 1
a131 1
if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
d135 1
a135 1
  ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
d137 1
a137 1
  if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
d141 1
a141 1
    ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
@


