Skip to content

Commit df44391

Browse files
sam-githublevitte
authored andcommitted
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 <[email protected]> Reviewed-by: Matthias St. Pierre <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (Merged from openssl#8092)
1 parent d6f4b0a commit df44391

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+113
-113
lines changed

CHANGES

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
implementations. This includes a generic EVP_PKEY to EVP_MAC bridge,
7575
to facilitate the continued use of MACs through raw private keys in
7676
functionality such as EVP_DigestSign* and EVP_DigestVerify*.
77-
[Richard Levitte]
77+
[Richard Levitte]
7878

7979
*) Deprecate ECDH_KDF_X9_62() and mark its replacement as internal. Users
8080
should use the EVP interface instead (EVP_PKEY_CTX_set_ecdh_kdf_type).

CONTRIBUTING

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ guidelines:
5757
7. For user visible changes (API changes, behaviour changes, ...),
5858
consider adding a note in CHANGES. This could be a summarising
5959
description of the change, and could explain the grander details.
60-
Have a look through existing entries for inspiration.
60+
Have a look through existing entries for inspiration.
6161
Please note that this is NOT simply a copy of git-log oneliners.
6262
Also note that security fixes get an entry in CHANGES.
6363
This file helps users get more in depth information of what comes

Configurations/00-base-templates.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ my %targets=(
305305
sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
306306
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
307307
chacha_asm_src => "chacha-armv4.S",
308-
poly1305_asm_src=> "poly1305-armv4.S",
308+
poly1305_asm_src=> "poly1305-armv4.S",
309309
keccak1600_asm_src => "keccak1600-armv4.S",
310310
perlasm_scheme => "void"
311311
},

Configurations/50-win-onecore.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Mobile[?] Windows editions. It's a set up "umbrella" libraries that
55
# export subset of Win32 API that are common to all Windows 10 devices.
66
#
7-
# OneCore Configuration temporarly dedicated for console applications
7+
# OneCore Configuration temporarly dedicated for console applications
88
# due to disabled event logging, which is incompatible with one core.
99
# Error messages are provided via standard error only.
1010
# TODO: extend error handling to use ETW based eventing

Configurations/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ In each table entry, the following keys are significant:
118118
'<unistd.h>'. This is very rarely needed.
119119

120120
shared_extension => File name extension used for shared
121-
libraries.
121+
libraries.
122122
obj_extension => File name extension used for object files.
123123
On unix, this defaults to ".o" (NOTE: this
124124
is here for future use, it's not

Configurations/README.design

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ depends on the library 'libssl' to function properly.
8787
LIBS=../libcrypto
8888
SOURCE[../libcrypto]=aes.c evp.c cversion.c
8989
DEPEND[cversion.o]=buildinf.h
90-
90+
9191
GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)"
9292
DEPEND[buildinf.h]=../Makefile
9393
DEPEND[../util/mkbuildinf.pl]=../util/Foo.pm
@@ -102,7 +102,7 @@ show that duplicate information isn't an issue.
102102
This build.info file informs us that 'libcrypto' is built from a few
103103
source files, 'crypto/aes.c', 'crypto/evp.c' and 'crypto/cversion.c'.
104104
It also shows us that building the object file inferred from
105-
'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it
105+
'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it
106106
also shows the possibility to declare how some files are generated
107107
using some script, in this case a perl script, and how such scripts
108108
can be declared to depend on other files, in this case a perl module.
@@ -150,7 +150,7 @@ information comes down to this:
150150
SOURCE[libssl]=ssl/tls.c
151151
INCLUDE[libssl]=include
152152
DEPEND[libssl]=libcrypto
153-
153+
154154
PROGRAMS=apps/openssl
155155
SOURCE[apps/openssl]=apps/openssl.c
156156
INCLUDE[apps/openssl]=. include
@@ -165,7 +165,7 @@ information comes down to this:
165165
SOURCE[engines/ossltest]=engines/e_ossltest.c
166166
DEPEND[engines/ossltest]=libcrypto.a
167167
INCLUDE[engines/ossltest]=include
168-
168+
169169
GENERATE[crypto/buildinf.h]=util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)"
170170
DEPEND[crypto/buildinf.h]=Makefile
171171
DEPEND[util/mkbuildinf.pl]=util/Foo.pm

Configurations/descrip.mms.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ EOF
11051105
# object modules already.
11061106
my $main = $_->{attrs}->{has_main}
11071107
? '/INCLUDE=main' : '';
1108-
push @lines,
1108+
push @lines,
11091109
"\@ IF nomain THEN WRITE OPT_FILE \"$x/LIB$main\"",
11101110
"\@ IF .NOT. nomain THEN WRITE OPT_FILE \"$x/LIB\""
11111111
}

Configurations/unix-Makefile.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ errors:
800800
include/internal/o_str.h
801801
include/internal/err.h
802802
include/internal/sslconf.h );
803-
our @cryptoskipheaders = ( @sslheaders,
803+
our @cryptoskipheaders = ( @sslheaders,
804804
qw( include/openssl/conf_api.h
805805
include/openssl/ebcdic.h
806806
include/openssl/opensslconf.h

NOTES.ANDROID

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
you need to set ANDROID_NDK_HOME environment to point at NDK directory
2727
as /some/where/android-ndk-<ver>. Both variables are significant at both
2828
configuration and compilation times. NDK customarily supports multiple
29-
Android API levels, e.g. android-14, android-21, etc. By default latest
29+
Android API levels, e.g. android-14, android-21, etc. By default latest
3030
one available is chosen. If you need to target older platform, pass
3131
additional -D__ANDROID_API__=N to Configure. N is numeric value of the
3232
target platform version. For example, to compile for ICS on ARM with

NOTES.DJGPP

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
2+
33
INSTALLATION ON THE DOS PLATFORM WITH DJGPP
44
-------------------------------------------
55

@@ -29,7 +29,7 @@
2929
running "./Configure" with appropriate arguments:
3030

3131
./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
32-
32+
3333
And finally fire up "make". You may run out of DPMI selectors when
3434
running in a DOS box under Windows. If so, just close the BASH
3535
shell, go back to Windows, and restart BASH. Then run "make" again.

NOTES.VMS

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
for now is to rename the OpenSSL source directory, as follows (please
4343
adjust for the actual source directory name you have):
4444

45-
$ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR
45+
$ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR
4646

4747

4848
About MMS and DCL

apps/ct_log_list.cnf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# that are to be trusted.
33

44
# Google's list of logs can be found here:
5-
# www.certificate-transparency.org/known-logs
5+
# www.certificate-transparency.org/known-logs
66
# A Python program to convert the log list to OpenSSL's format can be
77
# found here:
8-
# https://github.com/google/certificate-transparency/blob/master/python/utilities/log_list/print_log_list.py
8+
# https://github.com/google/certificate-transparency/blob/master/python/utilities/log_list/print_log_list.py
99
# Use the "--openssl_output" flag.

apps/demoSRP/srp_verifier.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# records starting with a I followed by the g and N values and the id.
44
# The exact values ... you have to dig this out from the source of srp.c
55
# or srp_vfy.c
6-
# The last value of an I is used as the default group for new users.
6+
# The last value of an I is used as the default group for new users.

apps/dh1024.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
44
/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
55
-----END DH PARAMETERS-----
66

7-
These are the 1024-bit DH parameters from "Internet Key Exchange
7+
These are the 1024-bit DH parameters from "Internet Key Exchange
88
Protocol Version 2 (IKEv2)": https://tools.ietf.org/html/rfc5996
99

1010
See https://tools.ietf.org/html/rfc2412 for how they were generated.

apps/dh2048.pem

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ fDKQXkYuNs474553LBgOhgObJ4Oi7Aeij7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq
77
5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg==
88
-----END DH PARAMETERS-----
99

10-
These are the 2048-bit DH parameters from "More Modular Exponential
11-
(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)":
10+
These are the 2048-bit DH parameters from "More Modular Exponential
11+
(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)":
1212
https://tools.ietf.org/html/rfc3526
1313

1414
See https://tools.ietf.org/html/rfc2412 for how they were generated.

apps/dh4096.pem

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ARpyPBKnh+bXiHGaEL26WyaZwycYavTiPBqUaDS2FQvaJYPpyirUTOjbu8LbBN6O
1212
HNAGkSfVsFqpk7TqmI2P3cGG/7fckKbAj030Nck0BjGZ//////////8CAQI=
1313
-----END DH PARAMETERS-----
1414

15-
These are the 4096-bit DH parameters from "More Modular Exponential
16-
(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)":
15+
These are the 4096-bit DH parameters from "More Modular Exponential
16+
(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)":
1717
https://tools.ietf.org/html/rfc3526
1818

1919
See https://tools.ietf.org/html/rfc2412 for how they were generated.

apps/openssl-vms.cnf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ oid_section = new_oids
1818
# To use this configuration file with the "-extfile" option of the
1919
# "openssl x509" utility, name here the section containing the
2020
# X.509v3 extensions to use:
21-
# extensions =
21+
# extensions =
2222
# (Alternatively, use a configuration file that has only
2323
# X.509v3 extensions in its main [= default] section.)
2424

@@ -115,7 +115,7 @@ x509_extensions = v3_ca # The extensions to add to the self signed cert
115115
# input_password = secret
116116
# output_password = secret
117117

118-
# This sets a mask for permitted string types. There are several options.
118+
# This sets a mask for permitted string types. There are several options.
119119
# default: PrintableString, T61String, BMPString.
120120
# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
121121
# utf8only: only UTF8Strings (PKIX recommendation after 2004).

apps/openssl.cnf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ oid_section = new_oids
1818
# To use this configuration file with the "-extfile" option of the
1919
# "openssl x509" utility, name here the section containing the
2020
# X.509v3 extensions to use:
21-
# extensions =
21+
# extensions =
2222
# (Alternatively, use a configuration file that has only
2323
# X.509v3 extensions in its main [= default] section.)
2424

@@ -115,7 +115,7 @@ x509_extensions = v3_ca # The extensions to add to the self signed cert
115115
# input_password = secret
116116
# output_password = secret
117117

118-
# This sets a mask for permitted string types. There are several options.
118+
# This sets a mask for permitted string types. There are several options.
119119
# default: PrintableString, T61String, BMPString.
120120
# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
121121
# utf8only: only UTF8Strings (PKIX recommendation after 2004).

apps/s_client.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2360,7 +2360,7 @@ int s_client_main(int argc, char **argv)
23602360

23612361
BIO_push(fbio, sbio);
23622362
BIO_printf(fbio, "CONNECT %s HTTP/1.0\r\n", connectstr);
2363-
/*
2363+
/*
23642364
* Workaround for broken proxies which would otherwise close
23652365
* the connection when entering tunnel mode (eg Squid 2.6)
23662366
*/
@@ -3549,7 +3549,7 @@ static char *base64encode (const void *buf, size_t len)
35493549
i = EVP_EncodeBlock((unsigned char *)out, buf, len);
35503550
assert(i <= (int)outl);
35513551
if (i < 0)
3552-
*out = '\0';
3552+
*out = '\0';
35533553
return out;
35543554
}
35553555

config

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ THERE=`dirname $0`
1919
# pick up any command line args to config
2020
for i
2121
do
22-
case "$i" in
22+
case "$i" in
2323
-d*) options=$options" --debug";;
2424
-t*) DRYRUN="true" VERBOSE="true";;
2525
-v*) VERBOSE="true";;
@@ -59,7 +59,7 @@ __CNF_LDLIBS=
5959

6060
# Now test for ISC and SCO, since it is has a braindamaged uname.
6161
#
62-
# We need to work around FreeBSD 1.1.5.1
62+
# We need to work around FreeBSD 1.1.5.1
6363
(
6464
XREL=`uname -X 2>/dev/null | grep "^Release" | awk '{print $3}'`
6565
if [ "x$XREL" != "x" ]; then
@@ -363,7 +363,7 @@ esac
363363
# At this point we gone through all the one's
364364
# we know of: Punt
365365

366-
echo "${MACHINE}-whatever-${SYSTEM}"
366+
echo "${MACHINE}-whatever-${SYSTEM}"
367367
exit 0
368368
) 2>/dev/null | (
369369

@@ -433,7 +433,7 @@ fi
433433

434434
CCVER=${CCVER:-0}
435435

436-
# read the output of the embedded GuessOS
436+
# read the output of the embedded GuessOS
437437
read GUESSOS
438438

439439
echo Operating system: $GUESSOS
@@ -732,7 +732,7 @@ case "$GUESSOS" in
732732
*-*-[Uu]nix[Ww]are7)
733733
if [ "$CC" = "gcc" ]; then
734734
OUT="unixware-7-gcc" ; options="$options no-sse2"
735-
else
735+
else
736736
OUT="unixware-7" ; options="$options no-sse2"
737737
__CNF_CPPFLAGS="$__CNF_CPPFLAGS -D__i386__"
738738
fi
@@ -793,7 +793,7 @@ case "$GUESSOS" in
793793
OUT="aix64-gcc"
794794
fi
795795
elif [ $OBJECT_MODE -eq 64 ]; then
796-
echo 'Your $OBJECT_MODE was found to be set to 64'
796+
echo 'Your $OBJECT_MODE was found to be set to 64'
797797
OUT="aix64-cc"
798798
else
799799
OUT="aix-cc"
@@ -897,7 +897,7 @@ if [ ".$PERL" = . ] ; then
897897
exit 1
898898
fi
899899

900-
# run Configure to check to see if we need to specify the
900+
# run Configure to check to see if we need to specify the
901901
# compiler for the platform ... in which case we add it on
902902
# the end ... otherwise we leave it off
903903

@@ -920,7 +920,7 @@ if [ $? = "0" ]; then
920920
__CNF_LDFLAGS="'$__CNF_LDFLAGS'" \
921921
__CNF_LDLIBS="'$__CNF_LDLIBS'" \
922922
$PERL $THERE/Configure $OUT $options
923-
fi
923+
fi
924924
if [ "$DRYRUN" = "false" ]; then
925925
# eval to make sure quoted options, possibly with spaces inside,
926926
# are treated right

crypto/bn/asm/ia64.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
// on Itanium2! What to do? Reschedule loops for Itanium2? But then
4848
// Itanium would exhibit anti-scalability. So I've chosen to reschedule
4949
// for worst latency for every instruction aiming for best *all-round*
50-
// performance.
50+
// performance.
5151

5252
// Q. How much faster does it get?
5353
// A. Here is the output from 'openssl speed rsa dsa' for vanilla
@@ -471,7 +471,7 @@ bn_mul_add_words:
471471
.global bn_sqr_words#
472472
.proc bn_sqr_words#
473473
.align 64
474-
.skip 32 // makes the loop body aligned at 64-byte boundary
474+
.skip 32 // makes the loop body aligned at 64-byte boundary
475475
bn_sqr_words:
476476
.prologue
477477
.save ar.pfs,r2

crypto/bn/asm/sparcv8plus.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@
154154
.register %g2,#scratch
155155
.register %g3,#scratch
156156
# define FRAME_SIZE -192
157-
#else
157+
#else
158158
# define FRAME_SIZE -96
159-
#endif
159+
#endif
160160
/*
161161
* GNU assembler can't stand stuw:-(
162162
*/

crypto/bn/bn_ctx.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static int BN_STACK_push(BN_STACK *st, unsigned int idx)
256256
unsigned int newsize =
257257
st->size ? (st->size * 3 / 2) : BN_CTX_START_FRAMES;
258258
unsigned int *newitems;
259-
259+
260260
if ((newitems = OPENSSL_malloc(sizeof(*newitems) * newsize)) == NULL) {
261261
BNerr(BN_F_BN_STACK_PUSH, ERR_R_MALLOC_FAILURE);
262262
return 0;
@@ -310,7 +310,7 @@ static BIGNUM *BN_POOL_get(BN_POOL *p, int flag)
310310
/* Full; allocate a new pool item and link it in. */
311311
if (p->used == p->size) {
312312
BN_POOL_ITEM *item;
313-
313+
314314
if ((item = OPENSSL_malloc(sizeof(*item))) == NULL) {
315315
BNerr(BN_F_BN_POOL_GET, ERR_R_MALLOC_FAILURE);
316316
return NULL;

crypto/cryptlib.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ void OPENSSL_showfatal(const char *fmta, ...)
352352

353353
/*
354354
* TODO: (For non GUI and no std error cases)
355-
* Add event logging feature here.
355+
* Add event logging feature here.
356356
*/
357-
357+
358358
# if !defined(NDEBUG)
359359
/*
360360
* We are in a situation where we tried to report a critical
@@ -393,7 +393,7 @@ void OPENSSL_showfatal(const char *fmta, ...)
393393
# endif
394394
# else
395395
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
396-
# endif
396+
# endif
397397
}
398398
#else
399399
void OPENSSL_showfatal(const char *fmta, ...)

crypto/des/asm/des_enc.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ $4:
311311
sll out1, 28, out1 ! rotate
312312
xor $1, local1, $1 ! 1 finished, local1 now sbox 7
313313

314-
ld [global2+local2], local2 ! 2
314+
ld [global2+local2], local2 ! 2
315315
srl out0, 24, local1 ! 7
316316
or out1, local0, out1 ! rotate
317317

@@ -1390,7 +1390,7 @@ DES_ncbc_encrypt:
13901390
add %o7,global1,global1
13911391
sub global1,.PIC.DES_SPtrans-.des_and,out2
13921392

1393-
cmp in5, 0 ! enc
1393+
cmp in5, 0 ! enc
13941394

13951395
be .ncbc.dec
13961396
STPTR in4, IVEC

0 commit comments

Comments
 (0)