[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  23e77b0ba328afe3492d990cd24f7b8896b4246f (commit)
       via  e2e46dfa8c42b5d47723aaed60d7fce3d84455c5 (commit)
      from  458cb85d1985aa3efe0a33eb59123d23b5fa975a (commit)


- Log -----------------------------------------------------------------
commit 23e77b0ba328afe3492d990cd24f7b8896b4246f
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Fri Aug 21 14:18:59 2020 +1000

    Update test data for DSA public key text
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12688)

commit e2e46dfa8c42b5d47723aaed60d7fce3d84455c5
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Thu Aug 20 09:13:28 2020 +1000

    Add the correct enum value for DSA public key serialization
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12688)

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

Summary of changes:
 providers/implementations/encode_decode/encoder_dsa_pub.c | 2 +-
 test/recipes/30-test_evp_pkey_provided/DSA.pub.txt        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/providers/implementations/encode_decode/encoder_dsa_pub.c b/providers/implementations/encode_decode/encoder_dsa_pub.c
index f99388e150..e1201634b9 100644
--- a/providers/implementations/encode_decode/encoder_dsa_pub.c
+++ b/providers/implementations/encode_decode/encoder_dsa_pub.c
@@ -173,7 +173,7 @@ static int dsa_pub_print(void *ctx, void *dsa, OSSL_CORE_BIO *cout,
     if (out == NULL)
         return 0;
 
-    ret = ossl_prov_print_dsa(out, dsa, 0);
+    ret = ossl_prov_print_dsa(out, dsa, dsa_print_pub);
     BIO_free(out);
 
     return ret;
diff --git a/test/recipes/30-test_evp_pkey_provided/DSA.pub.txt b/test/recipes/30-test_evp_pkey_provided/DSA.pub.txt
index 1b1b758b03..0cd037294c 100644
--- a/test/recipes/30-test_evp_pkey_provided/DSA.pub.txt
+++ b/test/recipes/30-test_evp_pkey_provided/DSA.pub.txt
@@ -1,8 +1,4 @@
-Private-Key: (2048 bit)
-priv:
-    00:8f:c5:9e:d0:f7:2a:0b:66:f1:32:73:ae:f6:d9:
-    d4:db:2d:96:55:89:ff:ef:a8:5f:47:8f:ca:02:8a:
-    e1:35:90
+Public-Key: (2048 bit)
 pub: 
     44:19:c9:46:45:57:c1:a9:d8:30:99:29:6a:4b:63:
     71:69:96:35:17:b2:62:9b:80:0a:95:9d:6a:c0:32: