[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a0e594d6b5265efd412d248bd12e9d5305370286 (commit)
      from  e0d8523e801b7a1fcdda698f9c28dd7a0617cd02 (commit)


- Log -----------------------------------------------------------------
commit a0e594d6b5265efd412d248bd12e9d5305370286
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 7 16:00:19 2020 +0100

    Add the DSA serializers to the default provider tools
    
    The DSA serializers are implemented, but didn't get added to the
    default provider's serializer algorithm table.
    
    Fixes #10645
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10772)

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

Summary of changes:
 providers/defltprov.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/providers/defltprov.c b/providers/defltprov.c
index 5c11b4a910..b4a17a5030 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -432,6 +432,27 @@ static const OSSL_ALGORITHM deflt_serializer[] = {
       dh_param_pem_serializer_functions },
 #endif
 
+#ifndef OPENSSL_NO_DSA
+    { "DSA", "default=yes,format=text,type=private",
+      dsa_priv_text_serializer_functions },
+    { "DSA", "default=yes,format=text,type=public",
+      dsa_pub_text_serializer_functions },
+    { "DSA", "default=yes,format=text,type=domainparams",
+      dsa_param_text_serializer_functions },
+    { "DSA", "default=yes,format=der,type=private",
+      dsa_priv_der_serializer_functions },
+    { "DSA", "default=yes,format=der,type=public",
+      dsa_pub_der_serializer_functions },
+    { "DSA", "default=yes,format=der,type=domainparams",
+      dsa_param_der_serializer_functions },
+    { "DSA", "default=yes,format=pem,type=private",
+      dsa_priv_pem_serializer_functions },
+    { "DSA", "default=yes,format=pem,type=public",
+      dsa_pub_pem_serializer_functions },
+    { "DSA", "default=yes,format=pem,type=domainparams",
+      dsa_param_pem_serializer_functions },
+#endif
+
     { NULL, NULL, NULL }
 };