projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use $disabled{"dynamic-engine"} internally
[oweals/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 a861064ee155dd9ad9c5dca2435be7c5fe635ec5..763b0af61d991e62e9089b59a929445c563b4aeb 100644
(file)
--- a/
test/recipes/70-test_tlsextms.t
+++ b/
test/recipes/70-test_tlsextms.t
@@
-53,7
+53,7
@@
# 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 bld
top_dir/;
use OpenSSL::Test::Utils;
use TLSProxy::Proxy;
use File::Temp qw(tempfile);
use OpenSSL::Test::Utils;
use TLSProxy::Proxy;
use File::Temp qw(tempfile);
@@
-64,13
+64,10
@@
setup($test_name);
plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
-plan skip_all => "$test_name needs the engine feature enabled"
- if disabled("engine");
+plan skip_all => "$test_name needs the
dynamic
engine feature enabled"
+ if disabled("engine")
|| disabled("dynamic-engine")
;
-plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
- if config("no_shared");
-
-$ENV{OPENSSL_ENGINES} = top_dir("engines");
+$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$);
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$);
@@
-86,8
+83,8
@@
my $fullhand = 0;
my $proxy = TLSProxy::Proxy->new(
\&extms_filter,
cmdstr(app(["openssl"])),
my $proxy = TLSProxy::Proxy->new(
\&extms_filter,
cmdstr(app(["openssl"])),
- top_file("apps", "server.pem"),
- 1
+
src
top_file("apps", "server.pem"),
+ (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
);
plan tests => 9;
);
plan tests => 9;
@@
-215,11
+212,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();
}
}
@@
-237,7
+234,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 {