summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-01-31 10:31:35 -0800
committerRichard Levitte <levitte@openssl.org>2019-02-05 16:29:17 +0100
commit3b09585bd67c41445be4be8a84233e5d9a699264 (patch)
tree56b7dc13a392901713066d5ce8742dadc28fb6b1 /util
parent00f2bafec16b5981cc35c721dae35533c918cb0d (diff)
Remove unnecessary trailing whitespace
Trim trailing whitespace. It doesn't match OpenSSL coding standards, AFAICT, and it can cause problems with git tooling. Trailing whitespace remains in test data and external source. Backport-of: https://github.com/openssl/openssl/pull/8092 Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8134)
Diffstat (limited to 'util')
-rw-r--r--util/indent.pro2
-rw-r--r--util/local_shlib.com.in2
-rwxr-xr-xutil/openssl-format-source28
-rw-r--r--util/perl/TLSProxy/Alert.pm2
-rw-r--r--util/perl/TLSProxy/Message.pm4
-rw-r--r--util/perl/TLSProxy/Record.pm2
-rw-r--r--util/perl/TLSProxy/ServerHello.pm4
-rw-r--r--util/perl/TLSProxy/ServerKeyExchange.pm2
8 files changed, 23 insertions, 23 deletions
diff --git a/util/indent.pro b/util/indent.pro
index 443bddb1cc..3d3f747bf8 100644
--- a/util/indent.pro
+++ b/util/indent.pro
@@ -26,7 +26,7 @@
-nprs
-npsl
-nsc
--ppi1
+-ppi1
-saf
-sai
-saw
diff --git a/util/local_shlib.com.in b/util/local_shlib.com.in
index e49aa15c77..a381872537 100644
--- a/util/local_shlib.com.in
+++ b/util/local_shlib.com.in
@@ -16,7 +16,7 @@ $
$ NAMES := {- join(",", keys %names); -}
{-
join("\n", map { "\$ __$_ = \"".$names{$_}."\"" } keys %names);
--}
+-}
$ I = 0
$ LOOP:
$ E = F$ELEMENT(I,",",NAMES)
diff --git a/util/openssl-format-source b/util/openssl-format-source
index 2655e9c400..d629ec4947 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -8,18 +8,18 @@
# https://www.openssl.org/source/license.html
#
-# openssl-format-source
+# openssl-format-source
# - format source tree according to OpenSSL coding style using indent
#
# usage:
# openssl-format-source [-v] [-n] [file|directory] ...
#
# note: the indent options assume GNU indent v2.2.10 which was released
-# Feb-2009 so if you have an older indent the options may not
+# Feb-2009 so if you have an older indent the options may not
# match what is expected
#
# any marked block comment blocks have to be moved to align manually after
-# the reformatting has been completed as marking a block causes indent to
+# the reformatting has been completed as marking a block causes indent to
# not move it at all ...
#
@@ -55,17 +55,17 @@ fi
# Extra arguments; for adding the comment-formatting
INDENT_ARGS=""
-for i
+for i
do
if [ "$STOPARGS" != "true" ]; then
case $i in
--) STOPARGS="true"; continue;;
-n) DONT="true"; continue;;
- -v) VERBOSE="true";
+ -v) VERBOSE="true";
echo "INDENT_PROFILE=$INDENT_PROFILE";
continue;;
- -c) COMMENTS="true";
- INDENT_ARGS="-fc1 -fca -cdb -sc";
+ -c) COMMENTS="true";
+ INDENT_ARGS="-fc1 -fca -cdb -sc";
continue;;
-nc) COMMENTS="true";
continue;;
@@ -76,14 +76,14 @@ do
if [ -d "$i" ]; then
LIST=`find "$i" -name '*.[ch]' -print`
- else
+ else
if [ ! -f "$i" ]; then
echo "$0: source file not found: $i" >&2
exit 1
fi
LIST="$i"
fi
-
+
for j in $LIST
do
# ignore symlinks - we only ever process the base file - so if we
@@ -98,7 +98,7 @@ do
tmp=$(mktemp /tmp/indent.XXXXXX)
trap 'rm -f "$tmp"' HUP INT TERM EXIT
- case `basename $j` in
+ case `basename $j` in
# the list of files that indent is unable to handle correctly
# that we simply leave alone for manual formatting now
obj_dat.h|aes_core.c|aes_x86core.c|ecp_nistz256.c)
@@ -108,11 +108,11 @@ do
if [ "$COMMENTS" = "true" ]; then
# we have to mark single line comments as /*- ...*/ to stop indent
# messing with them, run expand then indent as usual but with the
- # the process-comments options and then undo that marking, and then
+ # the process-comments options and then undo that marking, and then
# finally re-run indent without process-comments so the marked-to-
- # be-ignored comments we did automatically end up getting moved
- # into the right position within the code as indent leaves marked
- # comments entirely untouched - we appear to have no way to avoid
+ # be-ignored comments we did automatically end up getting moved
+ # into the right position within the code as indent leaves marked
+ # comments entirely untouched - we appear to have no way to avoid
# the double processing and get the desired output
cat "$j" | \
expand | \
diff --git a/util/perl/TLSProxy/Alert.pm b/util/perl/TLSProxy/Alert.pm
index e66883d459..1c8a7f8185 100644
--- a/util/perl/TLSProxy/Alert.pm
+++ b/util/perl/TLSProxy/Alert.pm
@@ -16,7 +16,7 @@ sub new
$encrypted,
$level,
$description) = @_;
-
+
my $self = {
server => $server,
encrypted => $encrypted,
diff --git a/util/perl/TLSProxy/Message.pm b/util/perl/TLSProxy/Message.pm
index ee507f9e21..9eebfaad7a 100644
--- a/util/perl/TLSProxy/Message.pm
+++ b/util/perl/TLSProxy/Message.pm
@@ -238,7 +238,7 @@ sub get_messages
$startoffset = $recoffset;
$recoffset += 4;
$payload = "";
-
+
if ($recoffset <= $record->decrypt_len) {
#Some payload data is present in this record
if ($record->decrypt_len - $recoffset >= $messlen) {
@@ -410,7 +410,7 @@ sub new
$records,
$startoffset,
$message_frag_lens) = @_;
-
+
my $self = {
server => $server,
data => $data,
diff --git a/util/perl/TLSProxy/Record.pm b/util/perl/TLSProxy/Record.pm
index 0a280cb269..add7720ef2 100644
--- a/util/perl/TLSProxy/Record.pm
+++ b/util/perl/TLSProxy/Record.pm
@@ -173,7 +173,7 @@ sub new
$decrypt_len,
$data,
$decrypt_data) = @_;
-
+
my $self = {
flight => $flight,
content_type => $content_type,
diff --git a/util/perl/TLSProxy/ServerHello.pm b/util/perl/TLSProxy/ServerHello.pm
index c95bbeeaeb..8f662d038b 100644
--- a/util/perl/TLSProxy/ServerHello.pm
+++ b/util/perl/TLSProxy/ServerHello.pm
@@ -25,7 +25,7 @@ sub new
$records,
$startoffset,
$message_frag_lens) = @_;
-
+
my $self = $class->SUPER::new(
$server,
TLSProxy::Message::MT_SERVER_HELLO,
@@ -78,7 +78,7 @@ sub parse
my $extension_data;
if ($extensions_len != 0) {
$extension_data = substr($self->data, $ptr);
-
+
if (length($extension_data) != $extensions_len) {
die "Invalid extension length\n";
}
diff --git a/util/perl/TLSProxy/ServerKeyExchange.pm b/util/perl/TLSProxy/ServerKeyExchange.pm
index cb4cc7c762..57b83774c9 100644
--- a/util/perl/TLSProxy/ServerKeyExchange.pm
+++ b/util/perl/TLSProxy/ServerKeyExchange.pm
@@ -20,7 +20,7 @@ sub new
$records,
$startoffset,
$message_frag_lens) = @_;
-
+
my $self = $class->SUPER::new(
$server,
TLSProxy::Message::MT_SERVER_KEY_EXCHANGE,