aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-01-31 09:55:30 -0800
committerRichard Levitte <levitte@openssl.org>2019-02-05 16:25:11 +0100
commitdf4439186fb70ce72668d472943dbcd057df8f30 (patch)
treea455db2842bae7f6b47c17fa17fc3b20977ab20f /Configurations
parentd6f4b0a8bfbe901c72294d8923eb5b6f54ca7732 (diff)
downloadopenssl-df4439186fb70ce72668d472943dbcd057df8f30.zip
openssl-df4439186fb70ce72668d472943dbcd057df8f30.tar.gz
openssl-df4439186fb70ce72668d472943dbcd057df8f30.tar.bz2
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. Reviewed-by: Kurt Roeckx <kurt@roeckx.be> 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/8092)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/00-base-templates.conf2
-rw-r--r--Configurations/50-win-onecore.conf2
-rw-r--r--Configurations/README2
-rw-r--r--Configurations/README.design8
-rw-r--r--Configurations/descrip.mms.tmpl2
-rw-r--r--Configurations/unix-Makefile.tmpl2
6 files changed, 9 insertions, 9 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index eb9feae..c92d640 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -305,7 +305,7 @@ my %targets=(
sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
chacha_asm_src => "chacha-armv4.S",
- poly1305_asm_src=> "poly1305-armv4.S",
+ poly1305_asm_src=> "poly1305-armv4.S",
keccak1600_asm_src => "keccak1600-armv4.S",
perlasm_scheme => "void"
},
diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf
index c71d364..51cb381 100644
--- a/Configurations/50-win-onecore.conf
+++ b/Configurations/50-win-onecore.conf
@@ -4,7 +4,7 @@
# Mobile[?] Windows editions. It's a set up "umbrella" libraries that
# export subset of Win32 API that are common to all Windows 10 devices.
#
-# OneCore Configuration temporarly dedicated for console applications
+# OneCore Configuration temporarly dedicated for console applications
# due to disabled event logging, which is incompatible with one core.
# Error messages are provided via standard error only.
# TODO: extend error handling to use ETW based eventing
diff --git a/Configurations/README b/Configurations/README
index 1e4d545..a106f8c 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -118,7 +118,7 @@ In each table entry, the following keys are significant:
'<unistd.h>'. This is very rarely needed.
shared_extension => File name extension used for shared
- libraries.
+ libraries.
obj_extension => File name extension used for object files.
On unix, this defaults to ".o" (NOTE: this
is here for future use, it's not
diff --git a/Configurations/README.design b/Configurations/README.design
index 43b6a66..75c19a6 100644
--- a/Configurations/README.design
+++ b/Configurations/README.design
@@ -87,7 +87,7 @@ depends on the library 'libssl' to function properly.
LIBS=../libcrypto
SOURCE[../libcrypto]=aes.c evp.c cversion.c
DEPEND[cversion.o]=buildinf.h
-
+
GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)"
DEPEND[buildinf.h]=../Makefile
DEPEND[../util/mkbuildinf.pl]=../util/Foo.pm
@@ -102,7 +102,7 @@ show that duplicate information isn't an issue.
This build.info file informs us that 'libcrypto' is built from a few
source files, 'crypto/aes.c', 'crypto/evp.c' and 'crypto/cversion.c'.
It also shows us that building the object file inferred from
-'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it
+'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it
also shows the possibility to declare how some files are generated
using some script, in this case a perl script, and how such scripts
can be declared to depend on other files, in this case a perl module.
@@ -150,7 +150,7 @@ information comes down to this:
SOURCE[libssl]=ssl/tls.c
INCLUDE[libssl]=include
DEPEND[libssl]=libcrypto
-
+
PROGRAMS=apps/openssl
SOURCE[apps/openssl]=apps/openssl.c
INCLUDE[apps/openssl]=. include
@@ -165,7 +165,7 @@ information comes down to this:
SOURCE[engines/ossltest]=engines/e_ossltest.c
DEPEND[engines/ossltest]=libcrypto.a
INCLUDE[engines/ossltest]=include
-
+
GENERATE[crypto/buildinf.h]=util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)"
DEPEND[crypto/buildinf.h]=Makefile
DEPEND[util/mkbuildinf.pl]=util/Foo.pm
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index a0bc93d..ae365c6 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -1105,7 +1105,7 @@ EOF
# object modules already.
my $main = $_->{attrs}->{has_main}
? '/INCLUDE=main' : '';
- push @lines,
+ push @lines,
"\@ IF nomain THEN WRITE OPT_FILE \"$x/LIB$main\"",
"\@ IF .NOT. nomain THEN WRITE OPT_FILE \"$x/LIB\""
}
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 90f469f..36286f6 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -800,7 +800,7 @@ errors:
include/internal/o_str.h
include/internal/err.h
include/internal/sslconf.h );
- our @cryptoskipheaders = ( @sslheaders,
+ our @cryptoskipheaders = ( @sslheaders,
qw( include/openssl/conf_api.h
include/openssl/ebcdic.h
include/openssl/opensslconf.h