projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e56612)
Fix various indentation
authorMatt Caswell <matt@openssl.org>
Thu, 8 Dec 2016 09:44:06 +0000 (09:44 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 8 Dec 2016 17:21:35 +0000 (17:21 +0000)
The indentation was a bit off in some of the perl files following the
extensions refactor.

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
test/recipes/70-test_sslmessages.t patch | blob | history
test/recipes/70-test_tls13messages.t patch | blob | history
util/TLSProxy/EncryptedExtensions.pm patch | blob | history
util/TLSProxy/Proxy.pm patch | blob | history

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index 2476fb118483b80440bf2b539c4e83e0051d85d6..4e87e537c32073e3ced5cd54e60442ec46142882 100755 (executable)
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -163,9 +163,9 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -status");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
-              "status_request handshake test (client)");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
+               "status_request handshake test (client)");
 
 #Test 4: A status_request handshake (server support only)
 $proxy->clear();
@@ -175,7 +175,7 @@ $proxy->serverflags("-status_file "
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "status_request handshake test (server)");
+               "status_request handshake test (server)");
 
 #Test 5: A status_request handshake (client and server)
 $proxy->clear();
@@ -184,10 +184,10 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "status_request handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+               "status_request handshake test");
 
 #Test 6: A client auth handshake
 $proxy->clear();
@@ -214,7 +214,7 @@ $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS
                | checkhandshake::SERVER_NAME_CLI_EXTENSION,
-              "Server name handshake test (client)");
+               "Server name handshake test (client)");
 
 #Test 9: Server name handshake (server support only)
 $proxy->clear();
@@ -223,7 +223,7 @@ $proxy->serverflags("-servername testhost");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "Server name handshake test (server)");
+               "Server name handshake test (server)");
 
 #Test 10: Server name handshake (client and server)
 $proxy->clear();
@@ -231,10 +231,10 @@ $proxy->clientflags("-no_tls1_3 -servername testhost");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SERVER_NAME_CLI_EXTENSION
-              | checkhandshake::SERVER_NAME_SRV_EXTENSION,
-              "Server name handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SERVER_NAME_CLI_EXTENSION
+               | checkhandshake::SERVER_NAME_SRV_EXTENSION,
+               "Server name handshake test");
 
 #Test 11: ALPN handshake (client request only)
 $proxy->clear();
@@ -243,7 +243,7 @@ $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS
                | checkhandshake::ALPN_CLI_EXTENSION,
-              "ALPN handshake test (client)");
+               "ALPN handshake test (client)");
 
 #Test 12: ALPN handshake (server support only)
 $proxy->clear();
@@ -252,7 +252,7 @@ $proxy->serverflags("-alpn test");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "ALPN handshake test (server)");
+               "ALPN handshake test (server)");
 
 #Test 13: ALPN handshake (client and server)
 $proxy->clear();
@@ -260,10 +260,10 @@ $proxy->clientflags("-no_tls1_3 -alpn test");
 $proxy->serverflags("-alpn test");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::ALPN_CLI_EXTENSION
-              | checkhandshake::ALPN_SRV_EXTENSION,
-              "ALPN handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION
+               | checkhandshake::ALPN_SRV_EXTENSION,
+               "ALPN handshake test");
 
 #Test 14: SCT handshake (client request only)
 $proxy->clear();
@@ -273,11 +273,11 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SCT_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "SCT handshake test (client)");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SCT_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+               "SCT handshake test (client)");
 
 #Test 15: SCT handshake (server support only)
 $proxy->clear();
@@ -287,8 +287,8 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS,
-              "SCT handshake test (server)");
+               checkhandshake::DEFAULT_EXTENSIONS,
+               "SCT handshake test (server)");
 
 #Test 16: SCT handshake (client and server)
 #There is no built-in server side support for this so we are actually also
@@ -301,12 +301,12 @@ $proxy->serverflags("-status_file "
                     ." -serverinfo ".srctop_file("test", "serverinfo.pem"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SCT_CLI_EXTENSION
-              | checkhandshake::SCT_SRV_EXTENSION
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "SCT handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SCT_CLI_EXTENSION
+               | checkhandshake::SCT_SRV_EXTENSION
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+               "SCT handshake test");
 
 
 #Test 17: NPN handshake (client request only)
@@ -333,10 +333,10 @@ $proxy->clientflags("-no_tls1_3 -nextprotoneg test");
 $proxy->serverflags("-nextprotoneg test");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::NPN_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::NPN_CLI_EXTENSION
-              | checkhandshake::NPN_SRV_EXTENSION,
-              "NPN handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::NPN_CLI_EXTENSION
+               | checkhandshake::NPN_SRV_EXTENSION,
+               "NPN handshake test");
 
 #Test 20: SRP extension
 #Note: We are not actually going to perform an SRP handshake (TLSProxy does not
@@ -347,6 +347,6 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -srpuser user -srppass pass:pass");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SRP_CLI_EXTENSION,
-              "SRP extension test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SRP_CLI_EXTENSION,
+               "SRP extension test");
diff --git a/test/recipes/70-test_tls13messages.t b/test/recipes/70-test_tls13messages.t
index f1493613b7f3e463b23bc2fba0e7fc57fb3c7d70..15dfa9f8d2bbcc080cd1f93e9f73e58ca13ba83a 100755 (executable)
--- a/test/recipes/70-test_tls13messages.t
+++ b/test/recipes/70-test_tls13messages.t
@@ -124,9 +124,9 @@ $proxy->clear();
 $proxy->clientflags("-status");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
-              "status_request handshake test (client)");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
+               "status_request handshake test (client)");
 
 #Test 4: A status_request handshake (server support only)
 $proxy->clear();
@@ -135,7 +135,7 @@ $proxy->serverflags("-status_file "
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "status_request handshake test (server)");
+               "status_request handshake test (server)");
 
 #Test 5: A status_request handshake (client and server)
 #TODO(TLS1.3): TLS1.3 doesn't actually have CertificateStatus messages. This is
@@ -147,10 +147,10 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "status_request handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+               "status_request handshake test");
 
 #Test 6: A client auth handshake
 $proxy->clear();
@@ -159,7 +159,7 @@ $proxy->serverflags("-Verify 5");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::CLIENT_AUTH_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "Client auth handshake test");
+               "Client auth handshake test");
 
 #Test 7: Server name handshake (client request only)
 $proxy->clear();
@@ -168,7 +168,7 @@ $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS
                | checkhandshake::SERVER_NAME_CLI_EXTENSION,
-              "Server name handshake test (client)");
+               "Server name handshake test (client)");
 
 #Test 8: Server name handshake (server support only)
 $proxy->clear();
@@ -176,7 +176,7 @@ $proxy->serverflags("-servername testhost");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "Server name handshake test (server)");
+               "Server name handshake test (server)");
 
 #Test 9: Server name handshake (client and server)
 $proxy->clear();
@@ -184,10 +184,10 @@ $proxy->clientflags("-servername testhost");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SERVER_NAME_CLI_EXTENSION
-              | checkhandshake::SERVER_NAME_SRV_EXTENSION,
-              "Server name handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SERVER_NAME_CLI_EXTENSION
+               | checkhandshake::SERVER_NAME_SRV_EXTENSION,
+               "Server name handshake test");
 
 #Test 10: ALPN handshake (client request only)
 $proxy->clear();
@@ -196,7 +196,7 @@ $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS
                | checkhandshake::ALPN_CLI_EXTENSION,
-              "ALPN handshake test (client)");
+               "ALPN handshake test (client)");
 
 #Test 11: ALPN handshake (server support only)
 $proxy->clear();
@@ -204,7 +204,7 @@ $proxy->serverflags("-alpn test");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
-              "ALPN handshake test (server)");
+               "ALPN handshake test (server)");
 
 #Test 12: ALPN handshake (client and server)
 $proxy->clear();
@@ -212,10 +212,10 @@ $proxy->clientflags("-alpn test");
 $proxy->serverflags("-alpn test");
 $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::ALPN_CLI_EXTENSION
-              | checkhandshake::ALPN_SRV_EXTENSION,
-              "ALPN handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION
+               | checkhandshake::ALPN_SRV_EXTENSION,
+               "ALPN handshake test");
 
 #Test 13: SCT handshake (client request only)
 #TODO(TLS1.3): This only checks that the client side extension appears. The
@@ -231,8 +231,8 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
 checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
-              checkhandshake::DEFAULT_EXTENSIONS
-              | checkhandshake::SCT_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "SCT handshake test");
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SCT_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+               | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+               "SCT handshake test");
diff --git a/util/TLSProxy/EncryptedExtensions.pm b/util/TLSProxy/EncryptedExtensions.pm
index 82e6c5e5c795ee69c965a0b999e82e74977efc25..81242e29ff9de8f8fbdc1ab65bb8a6d3355f5541 100644 (file)
--- a/util/TLSProxy/EncryptedExtensions.pm
+++ b/util/TLSProxy/EncryptedExtensions.pm
@@ -82,9 +82,9 @@ sub set_message_contents
         $extensions .= pack("n", length($extdata));
         $extensions .= $extdata;
         if ($key == TLSProxy::Message::EXT_DUPLICATE_EXTENSION) {
-          $extensions .= pack("n", $key);
-          $extensions .= pack("n", length($extdata));
-          $extensions .= $extdata;
+            $extensions .= pack("n", $key);
+            $extensions .= pack("n", length($extdata));
+            $extensions .= $extdata;
         }
     }
 
@@ -98,7 +98,7 @@ sub extension_data
 {
     my $self = shift;
     if (@_) {
-      $self->{extension_data} = shift;
+        $self->{extension_data} = shift;
     }
     return $self->{extension_data};
 }
diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 37abfb03e99fe7cf9990b855baeee5b628d75450..65615891f8b17615a35110b3e21e3981b4756c96 100644 (file)
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -410,7 +410,7 @@ sub proxy_addr
 {
     my $self = shift;
     if (@_) {
-      $self->{proxy_addr} = shift;
+        $self->{proxy_addr} = shift;
     }
     return $self->{proxy_addr};
 }
@@ -418,7 +418,7 @@ sub proxy_port
 {
     my $self = shift;
     if (@_) {
-      $self->{proxy_port} = shift;
+        $self->{proxy_port} = shift;
     }
     return $self->{proxy_port};
 }
@@ -426,7 +426,7 @@ sub server_addr
 {
     my $self = shift;
     if (@_) {
-      $self->{server_addr} = shift;
+        $self->{server_addr} = shift;
     }
     return $self->{server_addr};
 }
@@ -434,7 +434,7 @@ sub server_port
 {
     my $self = shift;
     if (@_) {
-      $self->{server_port} = shift;
+        $self->{server_port} = shift;
     }
     return $self->{server_port};
 }
@@ -442,7 +442,7 @@ sub filter
 {
     my $self = shift;
     if (@_) {
-      $self->{filter} = shift;
+        $self->{filter} = shift;
     }
     return $self->{filter};
 }
@@ -450,7 +450,7 @@ sub cipherc
 {
     my $self = shift;
     if (@_) {
-      $self->{cipherc} = shift;
+        $self->{cipherc} = shift;
     }
     return $self->{cipherc};
 }
@@ -458,7 +458,7 @@ sub ciphers
 {
     my $self = shift;
     if (@_) {
-      $self->{ciphers} = shift;
+        $self->{ciphers} = shift;
     }
     return $self->{ciphers};
 }
@@ -466,7 +466,7 @@ sub serverflags
 {
     my $self = shift;
     if (@_) {
-      $self->{serverflags} = shift;
+        $self->{serverflags} = shift;
     }
     return $self->{serverflags};
 }
@@ -474,7 +474,7 @@ sub clientflags
 {
     my $self = shift;
     if (@_) {
-      $self->{clientflags} = shift;
+        $self->{clientflags} = shift;
     }
     return $self->{clientflags};
 }
@@ -482,7 +482,7 @@ sub serverconnects
 {
     my $self = shift;
     if (@_) {
-      $self->{serverconnects} = shift;
+        $self->{serverconnects} = shift;
     }
     return $self->{serverconnects};
 }
@@ -502,7 +502,7 @@ sub serverpid
 {
     my $self = shift;
     if (@_) {
-      $self->{serverpid} = shift;
+        $self->{serverpid} = shift;
     }
     return $self->{serverpid};
 }
@@ -521,7 +521,7 @@ sub is_tls13
 {
     my $class = shift;
     if (@_) {
-      $is_tls13 = shift;
+        $is_tls13 = shift;
     }
     return $is_tls13;
 }
@@ -530,7 +530,7 @@ sub reneg
 {
     my $self = shift;
     if (@_) {
-      $self->{reneg} = shift;
+        $self->{reneg} = shift;
     }
     return $self->{reneg};
 }
Unnamed repository; edit this file 'description' to name the repository.