[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  b043c41c0059786eb78492fb64217053272ef37d (commit)
       via  b2d14651533897b709208e633d4b4f590e0eff1c (commit)
      from  2c61a670ebf2f1923a3bd2ef0ee4b2fa6261eaeb (commit)


- Log -----------------------------------------------------------------
commit b043c41c0059786eb78492fb64217053272ef37d
Author: Etienne Millon <me at emillon.org>
Date:   Mon Jan 4 11:33:55 2021 +0100

    28-seclevel.cnf.in: fix typo in algo name
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13768)

commit b2d14651533897b709208e633d4b4f590e0eff1c
Author: Etienne Millon <me at emillon.org>
Date:   Mon Jan 4 11:28:36 2021 +0100

    EVP_SIGNATURE-ED25519.pod: fix typo in algo name
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13768)

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

Summary of changes:
 doc/man7/EVP_SIGNATURE-ED25519.pod | 2 +-
 test/ssl-tests/28-seclevel.cnf.in  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/man7/EVP_SIGNATURE-ED25519.pod b/doc/man7/EVP_SIGNATURE-ED25519.pod
index bb91ae2434..e2fc31f724 100644
--- a/doc/man7/EVP_SIGNATURE-ED25519.pod
+++ b/doc/man7/EVP_SIGNATURE-ED25519.pod
@@ -15,7 +15,7 @@ one-shot digest sign and digest verify using PureEdDSA and B<Ed25519> or B<Ed448
 (see RFC8032). It has associated private and public key formats compatible with
 RFC 8410.
 
-=head2 ED25591 and ED448 Signature Parameters
+=head2 ED25519 and ED448 Signature Parameters
 
 No additional parameters can be set during one-shot signing or verification.
 In particular, because PureEdDSA is used, a digest must B<NOT> be specified when
diff --git a/test/ssl-tests/28-seclevel.cnf.in b/test/ssl-tests/28-seclevel.cnf.in
index ebb082c0af..b7b96e87b7 100644
--- a/test/ssl-tests/28-seclevel.cnf.in
+++ b/test/ssl-tests/28-seclevel.cnf.in
@@ -34,7 +34,7 @@ our @tests_ec = (
         test   => { "ExpectedResult" => "Success" },
     },
     {
-        # The Ed488 signature algorithm will not be enabled.
+        # The Ed448 signature algorithm will not be enabled.
         # Because of the config order, the certificate is first loaded, and
         # then the security level is chaged. If you try this with s_server
         # the order will be reversed and it will instead fail to load the key.
@@ -47,7 +47,7 @@ our @tests_ec = (
         test   => { "ExpectedResult" => "ServerFail" },
     },
     {
-        # The client will not sent the Ed488 signature algorithm, so the server
+        # The client will not sent the Ed448 signature algorithm, so the server
         # doesn't have a useable signature algorithm for the certificate.
         name => "SECLEVEL 5 client with ED448 key",
         server => { "CipherString" => "DEFAULT:\@SECLEVEL=4",