From: David Benjamin <davidben@google.com>
Date: Thu, 18 Aug 2016 04:38:43 +0000 (-0400)
Subject: Address review comments.
X-Git-Tag: OpenSSL_1_1_1-pre1~3453
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3058b742664287a30be77488c2ce3d8103bffd64;p=oweals%2Fopenssl.git

Address review comments.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/test/recipes/70-test_sslcbcpadding.t b/test/recipes/70-test_sslcbcpadding.t
index fddbeab015..e2df24e8d1 100644
--- a/test/recipes/70-test_sslcbcpadding.t
+++ b/test/recipes/70-test_sslcbcpadding.t
@@ -23,8 +23,8 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled"
 plan skip_all => "$test_name needs the sock feature enabled"
     if disabled("sock");
 
-plan skip_all => "$test_name needs TLSv1.2 enabled"
-    if disabled("tls1_2");
+plan skip_all => "$test_name needs TLSv1.1 enabled"
+    if disabled("tls1_1");
 
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
 my $proxy = TLSProxy::Proxy->new(
@@ -34,23 +34,21 @@ my $proxy = TLSProxy::Proxy->new(
     (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
 );
 
-my $bad_padding_offset = -1;
-
 # TODO: We could test all 256 values, but then the log file gets too large for
 # CI. See https://github.com/openssl/openssl/issues/1440.
 my @test_offsets = (0, 128, 254, 255);
 
-plan tests => 1 + scalar(@test_offsets);
-
 # Test that maximally-padded records are accepted.
+my $bad_padding_offset = -1;
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
+plan tests => 1 + scalar(@test_offsets);
 ok(TLSProxy::Message->success(), "Maximally-padded record test");
 
 # Test that invalid padding is rejected.
 foreach my $offset (@test_offsets) {
     $proxy->clear();
     $bad_padding_offset = $offset;
-    $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";;
+    $proxy->start();
     ok(TLSProxy::Message->fail(), "Invalid padding byte $bad_padding_offset");
 }