[openssl] master update
Richard Levitte
levitte at openssl.org
Fri Jun 19 06:00:47 UTC 2020
The branch master has been updated
via 6f72b210b2ae15577f0f043a371dba041e16f2a8 (commit)
from 9a7319b0b0b9ddaa440b102dc8e197d267700756 (commit)
- Log -----------------------------------------------------------------
commit 6f72b210b2ae15577f0f043a371dba041e16f2a8
Author: haykam821 <24855774+haykam821 at users.noreply.github.com>
Date: Mon Jun 15 16:17:15 2020 -0400
Remove whitespace from 'white space'
CLA: trivial
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12161)
-----------------------------------------------------------------------
Summary of changes:
apps/lib/win32_init.c | 2 +-
crypto/asn1/asn_mime.c | 4 ++--
crypto/evp/encode.c | 2 +-
crypto/perlasm/arm-xlate.pl | 2 +-
crypto/perlasm/ppc-xlate.pl | 2 +-
crypto/perlasm/x86_64-xlate.pl | 2 +-
doc/man1/openssl-asn1parse.pod.in | 2 +-
doc/man1/openssl-ca.pod.in | 4 ++--
doc/man1/openssl-req.pod.in | 4 ++--
doc/man1/openssl-ts.pod.in | 4 ++--
doc/man5/config.pod | 2 +-
util/find-doc-nits | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/apps/lib/win32_init.c b/apps/lib/win32_init.c
index 8836b3ba39..05d3c681d7 100644
--- a/apps/lib/win32_init.c
+++ b/apps/lib/win32_init.c
@@ -167,7 +167,7 @@ void win32_utf8argv(int *argc, char **argv[])
int in_quote = 0;
if (*p == L' ' || *p == L'\t') {
- p++; /* skip over white spaces */
+ p++; /* skip over whitespace */
continue;
}
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 4eb92d6844..dab89e57d5 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -763,7 +763,7 @@ static char *strip_ends(char *name)
static char *strip_start(char *name)
{
char *p, c;
- /* Look for first non white space or quote */
+ /* Look for first non whitespace or quote */
for (p = name; (c = *p); p++) {
if (c == '"') {
/* Next char is start of string if non null */
@@ -784,7 +784,7 @@ static char *strip_end(char *name)
char *p, c;
if (!name)
return NULL;
- /* Look for first non white space or quote */
+ /* Look for first non whitespace or quote */
for (p = name + strlen(name) - 1; p >= name; p--) {
c = *p;
if (c == '"') {
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 01552ac098..9c9a2836c4 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -422,7 +422,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
else
table = data_ascii2bin;
- /* trim white space from the start of the line. */
+ /* trim whitespace from the start of the line. */
while ((n > 0) && (conv_ascii2bin(*f, table) == B64_WS)) {
f++;
n--;
diff --git a/crypto/perlasm/arm-xlate.pl b/crypto/perlasm/arm-xlate.pl
index f0e495d426..a90885905c 100755
--- a/crypto/perlasm/arm-xlate.pl
+++ b/crypto/perlasm/arm-xlate.pl
@@ -150,7 +150,7 @@ while(my $line=<>) {
if ($line =~ m/^\s*(#|@|\/\/)/) { print $line; next; }
$line =~ s|/\*.*\*/||; # get rid of C-style comments...
- $line =~ s|^\s+||; # ... and skip white spaces in beginning...
+ $line =~ s|^\s+||; # ... and skip whitespace in beginning...
$line =~ s|\s+$||; # ... and at the end
{
diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
index 0c8009c031..136e73e8af 100755
--- a/crypto/perlasm/ppc-xlate.pl
+++ b/crypto/perlasm/ppc-xlate.pl
@@ -306,7 +306,7 @@ while($line=<>) {
$line =~ s|[#!;].*$||; # get rid of asm-style comments...
$line =~ s|/\*.*\*/||; # ... and C-style comments...
- $line =~ s|^\s+||; # ... and skip white spaces in beginning...
+ $line =~ s|^\s+||; # ... and skip whitespaces in beginning...
$line =~ s|\s+$||; # ... and at the end
{
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index fdf3e5438e..1830b25565 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -1200,7 +1200,7 @@ while(defined(my $line=<>)) {
$line =~ s|[#!].*$||; # get rid of asm-style comments...
$line =~ s|/\*.*\*/||; # ... and C-style comments...
- $line =~ s|^\s+||; # ... and skip white spaces in beginning
+ $line =~ s|^\s+||; # ... and skip whitespaces in beginning
$line =~ s|\s+$||; # ... and at the end
if (my $label=label->re(\$line)) { print $label->out(); }
diff --git a/doc/man1/openssl-asn1parse.pod.in b/doc/man1/openssl-asn1parse.pod.in
index 2374348561..bafcc225d9 100644
--- a/doc/man1/openssl-asn1parse.pod.in
+++ b/doc/man1/openssl-asn1parse.pod.in
@@ -158,7 +158,7 @@ numerical form (for example 1.2.3.4). The file passed to the B<-oid> option
allows additional OIDs to be included. Each line consists of three columns,
the first column is the OID in numerical format and should be followed by white
space. The second column is the "short name" which is a single word followed
-by white space. The final column is the rest of the line and is the
+by whitespace. The final column is the rest of the line and is the
"long name". Example:
C<1.2.3.4 shortName A long name>
diff --git a/doc/man1/openssl-ca.pod.in b/doc/man1/openssl-ca.pod.in
index 35b36afbb4..22a0cb40d8 100644
--- a/doc/man1/openssl-ca.pod.in
+++ b/doc/man1/openssl-ca.pod.in
@@ -432,8 +432,8 @@ any) used.
This specifies a file containing additional B<OBJECT IDENTIFIERS>.
Each line of the file should consist of the numerical form of the
-object identifier followed by white space then the short name followed
-by white space and finally the long name.
+object identifier followed by whitespace then the short name followed
+by whitespace and finally the long name.
=item B<oid_section>
diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in
index ab6b3d78a2..25295d02fc 100644
--- a/doc/man1/openssl-req.pod.in
+++ b/doc/man1/openssl-req.pod.in
@@ -375,8 +375,8 @@ overridden by the B<-keyout> option.
This specifies a file containing additional B<OBJECT IDENTIFIERS>.
Each line of the file should consist of the numerical form of the
-object identifier followed by white space then the short name followed
-by white space and finally the long name.
+object identifier followed by whitespace then the short name followed
+by whitespace and finally the long name.
=item B<oid_section>
diff --git a/doc/man1/openssl-ts.pod.in b/doc/man1/openssl-ts.pod.in
index 10386a3fc5..e7bc607a1f 100644
--- a/doc/man1/openssl-ts.pod.in
+++ b/doc/man1/openssl-ts.pod.in
@@ -372,8 +372,8 @@ section can be overridden with the B<-section> command line switch. (Optional)
This specifies a file containing additional B<OBJECT IDENTIFIERS>.
Each line of the file should consist of the numerical form of the
-object identifier followed by white space then the short name followed
-by white space and finally the long name. (Optional)
+object identifier followed by whitespace then the short name followed
+by whitespace and finally the long name. (Optional)
=item B<oid_section>
diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 12a1d1043e..13bd526c49 100644
--- a/doc/man5/config.pod
+++ b/doc/man5/config.pod
@@ -119,7 +119,7 @@ leading text that is preceded with a period. For example:
2.OU = Second OU
The B<value> consists of the string following the B<=> character until end
-of line with any leading and trailing white space removed.
+of line with any leading and trailing whitespace removed.
The value string undergoes variable expansion. The text C<$var> or C<${var}>
inserts the value of the named variable from the current section.
diff --git a/util/find-doc-nits b/util/find-doc-nits
index c40a4c8052..0feb01e27c 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -901,7 +901,7 @@ sub collectnames {
}
foreach my $name ( @{$podinfo{names}} ) {
next if $name eq "";
- err($id, "'$name' contains white space")
+ err($id, "'$name' contains whitespace")
if $name =~ /\s/;
my $name_sec = "$name($section)";
if ( !defined $name_map{$name_sec} ) {
More information about the openssl-commits
mailing list