[openssl] master update

Tue Feb 18 12:43:01 UTC 2020

The branch master has been updated
       via  21542a48ab542dc4d687a15e19c11318df58f72e (commit)
       via  0587a3afa119eb922ae2db50c9541db21b2099b4 (commit)
       via  e02b13ad5707c1c544b7e788d3f0ce87d61b7220 (commit)
       via  7354f78140fef4a58858a3f0d8c83fc8489481e3 (commit)
       via  af61cbca1c7a7cdb5869d72203fe78c504fd3725 (commit)
      from  d1eec097b99c3d16ada855505b406daa9ceb7d4f (commit)


- Log -----------------------------------------------------------------
commit 21542a48ab542dc4d687a15e19c11318df58f72e
Author: Alex Boboc <me at alexboboc.com>
Date:   Sun Feb 16 12:07:41 2020 -0800

    DOC:Fix typos in x509v3_config.pod
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11104)

commit 0587a3afa119eb922ae2db50c9541db21b2099b4
Author: Alex Boboc <me at alexboboc.com>
Date:   Sun Feb 16 12:04:12 2020 -0800

    DOC:Fix typos in man5/config.pod
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11104)

commit e02b13ad5707c1c544b7e788d3f0ce87d61b7220
Author: Alex Boboc <me at alexboboc.com>
Date:   Sun Feb 16 11:56:11 2020 -0800

    DOC:Fix typos in openssl-enc.pod.in + openssl.pod
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11104)

commit 7354f78140fef4a58858a3f0d8c83fc8489481e3
Author: Alex Boboc <me at alexboboc.com>
Date:   Sun Feb 16 11:25:51 2020 -0800

    DOC:Fix typos in ossl_cmp_print_log.pod
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11104)

commit af61cbca1c7a7cdb5869d72203fe78c504fd3725
Author: Alex Boboc <me at alexboboc.com>
Date:   Sat Feb 15 16:55:30 2020 -0800

    DOC:Fix typos in ossl_param_bld_init
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11104)

-----------------------------------------------------------------------

Summary of changes:
 doc/internal/man3/ossl_cmp_print_log.pod  | 2 +-
 doc/internal/man3/ossl_param_bld_init.pod | 4 ++--
 doc/man1/openssl-enc.pod.in               | 2 +-
 doc/man1/openssl.pod                      | 4 ++--
 doc/man5/config.pod                       | 2 +-
 doc/man5/x509v3_config.pod                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/internal/man3/ossl_cmp_print_log.pod b/doc/internal/man3/ossl_cmp_print_log.pod
index 47d4dd8efa..3fa5fe0132 100644
--- a/doc/internal/man3/ossl_cmp_print_log.pod
+++ b/doc/internal/man3/ossl_cmp_print_log.pod
@@ -68,7 +68,7 @@ the variable pointed to by I<level> with the severity level or -1,
 the variable pointed to by I<func> with the function name string or NULL,
 the variable pointed to by I<file> with the filename string or NULL, and
 the variable pointed to by I<line> with the line number or -1.
-Any string returned via I<*func> and I<*file> must be freeed by the caller.
+Any string returned via I<*func> and I<*file> must be freed by the caller.
 
 ossl_cmp_add_error_data() is a macro calling
 L<ERR_add_error_txt(3)> with the separator being ":".
diff --git a/doc/internal/man3/ossl_param_bld_init.pod b/doc/internal/man3/ossl_param_bld_init.pod
index 110192fbe0..8ae0dccb73 100644
--- a/doc/internal/man3/ossl_param_bld_init.pod
+++ b/doc/internal/man3/ossl_param_bld_init.pod
@@ -75,7 +75,7 @@ I<val> is stored by value and an expression or auto variable can be used.
 
 ossl_param_bld_push_BN() is a function that will create an OSSL_PARAM object
 that holds the specified BIGNUM I<bn>.
-If I<bn> is marked as being securely allocated, it's OSSL_PARAM representation
+If I<bn> is marked as being securely allocated, its OSSL_PARAM representation
 will also be securely allocated.
 The I<bn> argument is stored by reference and the underlying BIGNUM object
 must exist until after ossl_param_bld_to_param() has been called.
@@ -84,7 +84,7 @@ ossl_param_bld_push_BN_pad() is a function that will create an OSSL_PARAM object
 that holds the specified BIGNUM I<bn>.
 The object will be padded to occupy exactly I<sz> bytes, if insufficient space
 is specified an error results.
-If I<bn> is marked as being securely allocated, it's OSSL_PARAM representation
+If I<bn> is marked as being securely allocated, its OSSL_PARAM representation
 will also be securely allocated.
 The I<bn> argument is stored by reference and the underlying BIGNUM object
 must exist until after ossl_param_bld_to_param() has been called.
diff --git a/doc/man1/openssl-enc.pod.in b/doc/man1/openssl-enc.pod.in
index 515a452f70..6b8ab2a265 100644
--- a/doc/man1/openssl-enc.pod.in
+++ b/doc/man1/openssl-enc.pod.in
@@ -261,7 +261,7 @@ This command does not support authenticated encryption modes
 like CCM and GCM, and will not support such modes in the future.
 This is due to having to begin streaming output (e.g., to standard output
 when B<-out> is not used) before the authentication tag could be validated.
-When this command is used in a pipeline, the receiveing end will not be
+When this command is used in a pipeline, the receiving end will not be
 able to roll back upon authentication failure.  The AEAD modes currently in
 common use also suffer from catastrophic failure of confidentiality and/or
 integrity upon reuse of key/iv/nonce, and since B<openssl enc> places the
diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index a1e97cd9ce..bd3daa1a14 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -795,7 +795,7 @@ B<-xcert>, and B<-xchain> options.
 
 =item B<-xcertform> B<DER>|B<PEM>, B<-xkeyform> B<DER>|B<PEM>
 
-The input format for the extra certifcate and key, respectively.
+The input format for the extra certificate and key, respectively.
 See L<openssl(1)/Format Options> for details.
 
 =back
@@ -1047,7 +1047,7 @@ OpenSSL provides fine-grain control over how the subject and issuer DN's are
 displayed.
 This is specified by using the B<-nameopt> option, which takes a
 comma-separated list of options from the following set.
-An option may be preceeded by a minus sign, C<->, to turn it off.
+An option may be preceded by a minus sign, C<->, to turn it off.
 The default value is C<oneline>.
 The first four are the most commonly used.
 
diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 680ad6578a..b9ad06b124 100644
--- a/doc/man5/config.pod
+++ b/doc/man5/config.pod
@@ -51,7 +51,7 @@ if the B<=> character is not present but with it they just ignore
 the include.
 
 Pragmas can be specified with the B<.pragma> directive.
-See L</PRAGMAS> for mor information.
+See L</PRAGMAS> for more information.
 
 Each section in a configuration file consists of a number of name and
 value pairs of the form B<name=value>
diff --git a/doc/man5/x509v3_config.pod b/doc/man5/x509v3_config.pod
index 737c461f0c..e60aeb2c38 100644
--- a/doc/man5/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -60,7 +60,7 @@ The following sections describe each supported extension in detail.
 
 This is a multi valued extension which indicates whether a certificate is
 a CA certificate. The first (mandatory) name is B<CA> followed by B<TRUE> or
-B<FALSE>. If B<CA> is B<TRUE> then an optional B<pathlen> name followed by an
+B<FALSE>. If B<CA> is B<TRUE> then an optional B<pathlen> name followed by a
 non-negative value can be included.
 
 For example:
