The branch master has been updated
via 69853045e1154236d440eba363a001033f5e3781 (commit)
from ababe86b9674dca24ffb6b342fe7af852cf53466 (commit)
- Log -----------------------------------------------------------------
commit 69853045e1154236d440eba363a001033f5e3781
Author: Emilia Kasper <[email protected]>
Date: Tue Apr 5 14:04:05 2016 +0200
Rename ssltest -> ssltest_old
ssltest_old.c is deprecated. New tests should use ssl_test.c, and the
recipes in 80-test_ssl_new.t
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
test/Makefile.in | 24 +++++++++++------------
test/build.info | 8 ++++----
test/recipes/{80-test_ssl.t => 80-test_ssl_old.t} | 20 +++++++++----------
test/{ssltest.c => ssltest_old.c} | 0
4 files changed, 26 insertions(+), 26 deletions(-)
rename test/recipes/{80-test_ssl.t => 80-test_ssl_old.t} (98%)
rename test/{ssltest.c => ssltest_old.c} (100%)
diff --git a/test/Makefile.in b/test/Makefile.in
index aadf2c7..cefcd72 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -59,7 +59,7 @@ DESTEST= destest
RANDTEST= randtest
DHTEST= dhtest
DSATEST= dsatest
-SSLTEST= ssltest
+SSLTESTOLD= ssltest_old
DANETEST= danetest
RSATEST= rsa_test
ENGINETEST= enginetest
@@ -86,7 +86,7 @@ THREADSTEST= threadstest
AFALGTEST= afalgtest
D2ITEST = d2i_test
SSLTESTCTXTEST = ssl_test_ctx_test
-NEWSSLTEST = ssl_test
+SSLTEST = ssl_test
TESTS= alltests
@@ -100,7 +100,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \
$(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \
$(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
$(DANETEST)$(EXE_EXT) \
- $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) \
+ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTESTOLD)$(EXE_EXT) \
$(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
$(EVPTEST)$(EXE_EXT) $(EVPEXTRATEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) \
$(SECMEMTEST)$(EXE_EXT) \
@@ -110,7 +110,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \
$(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT)
$(ASYNCTEST)$(EXE_EXT) \
$(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT)
$(THREADSTEST)$(EXE_EXT) \
$(AFALGTEST)$(EXE_EXT) $(D2ITEST)$(EXE_EXT) $(SSLTESTCTXTEST)$(EXE_EXT)
\
- $(NEWSSLTEST)$(EXE_EXT)
+ $(SSLTEST)$(EXE_EXT)
# $(METHTEST)$(EXE_EXT)
@@ -123,13 +123,13 @@ OBJ= $(NPTEST).o $(MEMLEAKTEST).o \
$(DESTEST).o $(SHA1TEST).o $(SHA256TEST).o $(SHA512TEST).o \
$(MDC2TEST).o $(RMDTEST).o $(DANETEST).o \
$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
- $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \
+ $(BFTEST).o $(SSLTESTOLD).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \
$(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(V3NAMETEST).o \
$(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \
$(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \
$(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o \
$(THREADSTEST).o testutil.o $(AFALGTEST).o $(D2ITEST).o ssl_test_ctx.o \
- $(SSLTESTCTXTEST).o $(NEWSSLTEST).o handshake_helper.o
+ $(SSLTESTCTXTEST).o $(SSLTEST).o handshake_helper.o
SRC= $(NPTEST).c $(MEMLEAKTEST).c \
$(BNTEST).c $(ECTEST).c \
@@ -139,13 +139,13 @@ SRC= $(NPTEST).c $(MEMLEAKTEST).c \
$(RC2TEST).c $(RC4TEST).c $(RC5TEST).c $(DANETEST).c \
$(DESTEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
$(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
- $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \
+ $(BFTEST).c $(SSLTESTOLD).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \
$(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(V3NAMETEST).c \
$(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \
$(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \
$(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c \
$(THREADSTEST).c testutil.c $(AFALGTEST).c $(D2ITEST).c ssl_test_ctx.c \
- $(SSLTESTCTXTEST).c $(NEWSSLTEST).c handshake_helper.c
+ $(SSLTESTCTXTEST).c $(SSLTEST).c handshake_helper.c
HEADER= testutil.h ssl_test_ctx.h handshake_helper.h
@@ -322,8 +322,8 @@ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
@target=$(METHTEST); $(BUILD_CMD)
-$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
- @target=$(SSLTEST); $(BUILD_CMD)
+$(SSLTESTOLD)$(EXE_EXT): $(SSLTESTOLD).o $(DLIBSSL) $(DLIBCRYPTO)
+ @target=$(SSLTESTOLD); $(BUILD_CMD)
$(DANETEST)$(EXE_EXT): $(DANETEST).o $(DLIBSSL) $(DLIBCRYPTO)
@target=$(DANETEST); $(BUILD_CMD)
@@ -402,9 +402,9 @@ $(SSLTESTCTXTEST)$(EXE_EXT): $(SSLTESTCTXTEST).o testutil.o
ssl_test_ctx.o \
@target=$(SSLTESTCTXTEST) testutil="testutil.o ssl_test_ctx.o"; \
$(BUILD_CMD)
-$(NEWSSLTEST)$(EXE_EXT): $(NEWSSLTEST).o testutil.o ssl_test_ctx.o \
+$(SSLTEST)$(EXE_EXT): $(SSLTEST).o testutil.o ssl_test_ctx.o \
handshake_helper.o $(DLIBSSL) $(DLIBCRYPTO)
- @target=$(NEWSSLTEST) testutil="testutil.o ssl_test_ctx.o \
+ @target=$(SSLTEST) testutil="testutil.o ssl_test_ctx.o \
handshake_helper.o"; $(BUILD_CMD)
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/test/build.info b/test/build.info
index 2bbf1ba..3dcddb6 100644
--- a/test/build.info
+++ b/test/build.info
@@ -9,7 +9,7 @@ PROGRAMS=\
destest sha1test sha256t sha512t \
mdc2test rmdtest \
randtest dhtest enginetest casttest \
- bftest ssltest dsatest exptest rsa_test \
+ bftest ssltest_old dsatest exptest rsa_test \
evp_test evp_extra_test igetest v3nametest \
danetest heartbeat_test p5_crpt2_test \
constant_time_test verify_extra_test clienthellotest \
@@ -129,9 +129,9 @@ SOURCE[bftest]=bftest.c
INCLUDE[bftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[bftest]=../libcrypto
-SOURCE[ssltest]=ssltest.c
-INCLUDE[ssltest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[ssltest]=../libcrypto ../libssl
+SOURCE[ssltest_old]=ssltest_old.c
+INCLUDE[ssltest_old]={- rel2abs(catdir($builddir,"../include")) -} ..
../include
+DEPEND[ssltest_old]=../libcrypto ../libssl
SOURCE[dsatest]=dsatest.c
INCLUDE[dsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl_old.t
similarity index 98%
rename from test/recipes/80-test_ssl.t
rename to test/recipes/80-test_ssl_old.t
index 8cb33a1..855e7c6 100644
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -66,12 +66,12 @@ my $P2intermediate="tmp_intP2.ss";
my $server_sess="server.ss";
my $client_sess="client.ss";
-# ssltest.c is deprecated in favour of the new framework in ssl_test.c
+# ssltest_old.c is deprecated in favour of the new framework in ssl_test.c
# If you're adding tests here, you probably want to convert them to the
# new format in ssl_test.c and add recipes to 80-test_ssl_new.t instead.
plan tests =>
1 # For testss
- + 1 # For ssltest -test_cipherlist
+ + 1 # For ssltest_old -test_cipherlist
+ 14 # For the first testssl
+ 16 # For the first testsslproxy
+ 16 # For the second testsslproxy
@@ -89,10 +89,10 @@ subtest 'test_ss' => sub {
}
};
-my $check = ok(run(test(["ssltest","-test_cipherlist"])), "running ssltest");
+my $check = ok(run(test(["ssltest_old","-test_cipherlist"])), "running
ssltest_old");
SKIP: {
- skip "ssltest ended with error, skipping the rest", 3
+ skip "ssltest_old ended with error, skipping the rest", 3
if !$check;
note('test_ssl -- key U');
@@ -320,7 +320,7 @@ sub testssl {
my @CA = $CAtmp ? ("-CAfile", $CAtmp) : ("-CApath", bldtop_dir("certs"));
my @extra = @_;
- my @ssltest = ("ssltest",
+ my @ssltest = ("ssltest_old",
"-s_key", $key, "-s_cert", $cert,
"-c_key", $key, "-c_cert", $cert);
@@ -445,7 +445,7 @@ sub testssl {
ok(run(test([@ssltest, "-ipv4", @extra])),
'test TLS via IPv4');
}
-
+
SKIP: {
skip "No IPv6 available on this machine", 1
unless !disabled("sock") && have_IPv6();
@@ -536,13 +536,13 @@ sub testssl {
skip "skipping RSA tests", 2
if $no_rsa;
- ok(run(test(["ssltest", "-v", "-bio_pair", "-tls1", "-s_cert",
srctop_file("apps","server2.pem"), "-no_dhe", "-no_ecdhe", "-num", "10", "-f",
"-time", @extra])),
+ ok(run(test(["ssltest_old", "-v", "-bio_pair", "-tls1", "-s_cert",
srctop_file("apps","server2.pem"), "-no_dhe", "-no_ecdhe", "-num", "10", "-f",
"-time", @extra])),
'test tlsv1 with 1024bit RSA, no (EC)DHE, multiple handshakes');
skip "skipping RSA+DHE tests", 1
if $no_dh;
- ok(run(test(["ssltest", "-v", "-bio_pair", "-tls1", "-s_cert",
srctop_file("apps","server2.pem"), "-dhe1024dsa", "-num", "10", "-f", "-time",
@extra])),
+ ok(run(test(["ssltest_old", "-v", "-bio_pair", "-tls1", "-s_cert",
srctop_file("apps","server2.pem"), "-dhe1024dsa", "-num", "10", "-f", "-time",
@extra])),
'test tlsv1 with 1024bit RSA, 1024bit DHE, multiple handshakes');
}
@@ -834,7 +834,7 @@ sub testsslproxy {
my @CA = $CAtmp ? ("-CAfile", $CAtmp) : ("-CApath", bldtop_dir("certs"));
my @extra = @_;
- my @ssltest = ("ssltest",
+ my @ssltest = ("ssltest_old",
"-s_key", $key, "-s_cert", $cert,
"-c_key", $key, "-c_cert", $cert);
@@ -848,7 +848,7 @@ sub testsslproxy {
# letters get combined into just "B".
# The policy letter(s) then get filtered with the given auth letter
# in the table below, and the result gets tested with the given
- # condition. For details, read ssltest.c
+ # condition. For details, read ssltest_old.c
#
# certfilename => [ [ auth, cond, expected result ] ... ]
my %expected = ( "certP1.ss" => [ [ [ 'A', 'A' ], 1 ],
diff --git a/test/ssltest.c b/test/ssltest_old.c
similarity index 100%
rename from test/ssltest.c
rename to test/ssltest_old.c
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
