[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  649bd87cb46626472aada6b60682a5f23651954a (commit)
      from  9750b4d39c610bac89fde009c3b22147eee0249c (commit)


- Log -----------------------------------------------------------------
commit 649bd87cb46626472aada6b60682a5f23651954a
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Nov 4 12:31:19 2020 +1000

    defltprov: remove duplicate algorithm names.
    
    Ed25519 and Ed448 contained aliases that were the same as the primary name.
    This removes the aliases leaving ED25519 and ED448 as the canonical names.
    
    Matching is case insensitive, so no functionality is lost.  The FIPS provider
    didn't include the duplicates.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13308)

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

Summary of changes:
 providers/defltprov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/providers/defltprov.c b/providers/defltprov.c
index 123f03e726..425ec9a6c8 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -373,8 +373,8 @@ static const OSSL_ALGORITHM deflt_signature[] = {
 #endif
     { "RSA:rsaEncryption", "provider=default", ossl_rsa_signature_functions },
 #ifndef OPENSSL_NO_EC
-    { "ED25519:Ed25519", "provider=default", ossl_ed25519_signature_functions },
-    { "ED448:Ed448", "provider=default", ossl_ed448_signature_functions },
+    { "ED25519", "provider=default", ossl_ed25519_signature_functions },
+    { "ED448", "provider=default", ossl_ed448_signature_functions },
     { "ECDSA", "provider=default", ecossl_dsa_signature_functions },
 # ifndef OPENSSL_NO_SM2
     { "SM2", "provider=default", sm2_signature_functions },