projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the no-nextprotoneg option
[openssl.git]
/
test
/
recipes
/
70-test_tlsextms.t
diff --git
a/test/recipes/70-test_tlsextms.t
b/test/recipes/70-test_tlsextms.t
index 763f7e8304dd10864b8799fea209e7d0a1f5895d..24abfcf321d33175ddfdd0d3c844af68fc4cf9f8 100644
(file)
--- a/
test/recipes/70-test_tlsextms.t
+++ b/
test/recipes/70-test_tlsextms.t
@@
-53,7
+53,8
@@
# Hudson (tjh@cryptsoft.com).
use strict;
# Hudson (tjh@cryptsoft.com).
use strict;
-use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/;
+use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
+use OpenSSL::Test::Utils;
use TLSProxy::Proxy;
use File::Temp qw(tempfile);
use TLSProxy::Proxy;
use File::Temp qw(tempfile);
@@
-61,14
+62,14
@@
my $test_name = "test_tlsextms";
setup($test_name);
plan skip_all => "TLSProxy isn't usable on $^O"
setup($test_name);
plan skip_all => "TLSProxy isn't usable on $^O"
- if $^O =~ /^
VMS
$/;
+ if $^O =~ /^
(VMS|MSWin32)
$/;
-plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
- unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
- grep { /^SHARED_LIBS=/ }
- do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne "";
+plan skip_all => "$test_name needs the dynamic engine feature enabled"
+ if disabled("engine") || disabled("dynamic-engine");
+
+plan skip_all => "$test_name needs the sock feature enabled"
+ if disabled("sock");
-$ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$);
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$);
@@
-83,9
+84,9
@@
my $fullhand = 0;
my $proxy = TLSProxy::Proxy->new(
\&extms_filter,
my $proxy = TLSProxy::Proxy->new(
\&extms_filter,
- cmdstr(app(["openssl"])),
- top_file("apps", "server.pem"),
- 1
+ cmdstr(app(["openssl"])
, display => 1
),
+
src
top_file("apps", "server.pem"),
+ (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
);
plan tests => 9;
);
plan tests => 9;
@@
-137,12
+138,12
@@
setrmextms(0, 0);
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
-$proxy->clear();
+$proxy->clear
Client
();
$proxy->clientflags("-sess_in ".$session);
$proxy->clientstart();
checkmessages(5, "Session resumption extended master secret test", 1, 1, 0);
$proxy->clientflags("-sess_in ".$session);
$proxy->clientstart();
checkmessages(5, "Session resumption extended master secret test", 1, 1, 0);
-#Test 6: Session resumption extended master secret test or
gini
al session
+#Test 6: Session resumption extended master secret test or
igin
al session
# omits extension. Server must not resume session.
#Expected result: ClientHello extension seen; ServerHello extension seen
# Full handshake
# omits extension. Server must not resume session.
#Expected result: ClientHello extension seen; ServerHello extension seen
# Full handshake
@@
-153,7
+154,7
@@
setrmextms(1, 0);
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
-$proxy->clear();
+$proxy->clear
Client
();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 0);
$proxy->clientstart();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 0);
$proxy->clientstart();
@@
-169,11
+170,11
@@
setrmextms(0, 0);
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
-$proxy->clear();
+$proxy->clear
Client
();
$proxy->clientflags("-sess_in ".$session);
setrmextms(1, 0);
$proxy->clientstart();
$proxy->clientflags("-sess_in ".$session);
setrmextms(1, 0);
$proxy->clientstart();
-ok(TLSProxy::Message->fail(), "Client inconsistent session resu
p
mption");
+ok(TLSProxy::Message->fail(), "Client inconsistent session resumption");
#Test 8: Session resumption extended master secret test resumed session
# omits server extension. Client must abort connection.
#Test 8: Session resumption extended master secret test resumed session
# omits server extension. Client must abort connection.
@@
-185,7
+186,7
@@
setrmextms(0, 0);
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
-$proxy->clear();
+$proxy->clear
Client
();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 1);
$proxy->clientstart();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 1);
$proxy->clientstart();
@@
-201,7
+202,7
@@
setrmextms(0, 1);
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
$proxy->serverconnects(2);
$proxy->clientflags("-sess_out ".$session);
$proxy->start();
-$proxy->clear();
+$proxy->clear
Client
();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 0);
$proxy->clientstart();
$proxy->clientflags("-sess_in ".$session);
setrmextms(0, 0);
$proxy->clientstart();
@@
-213,11
+214,11
@@
sub extms_filter
foreach my $message (@{$proxy->message_list}) {
if ($crmextms && $message->mt == TLSProxy::Message::MT_CLIENT_HELLO) {
foreach my $message (@{$proxy->message_list}) {
if ($crmextms && $message->mt == TLSProxy::Message::MT_CLIENT_HELLO) {
- $message->delete_extension(TLSProxy::
ClientHello
::EXT_EXTENDED_MASTER_SECRET);
+ $message->delete_extension(TLSProxy::
Message
::EXT_EXTENDED_MASTER_SECRET);
$message->repack();
}
if ($srmextms && $message->mt == TLSProxy::Message::MT_SERVER_HELLO) {
$message->repack();
}
if ($srmextms && $message->mt == TLSProxy::Message::MT_SERVER_HELLO) {
- $message->delete_extension(TLSProxy::
ClientHello
::EXT_EXTENDED_MASTER_SECRET);
+ $message->delete_extension(TLSProxy::
Message
::EXT_EXTENDED_MASTER_SECRET);
$message->repack();
}
}
$message->repack();
}
}
@@
-235,7
+236,7
@@
sub checkmessages($$$$$)
#Get the extensions data
my %extensions = %{$message->extension_data};
if (defined
#Get the extensions data
my %extensions = %{$message->extension_data};
if (defined
- $extensions{TLSProxy::
ClientHello
::EXT_EXTENDED_MASTER_SECRET}) {
+ $extensions{TLSProxy::
Message
::EXT_EXTENDED_MASTER_SECRET}) {
if ($message->mt == TLSProxy::Message::MT_CLIENT_HELLO) {
$cextms = 1;
} else {
if ($message->mt == TLSProxy::Message::MT_CLIENT_HELLO) {
$cextms = 1;
} else {