[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  f7626d0bfab35acd89c2c6542fc6504954191a14 (commit)
      from  d718521fcad5506842fdf46b4a1f7163be22991b (commit)


- Log -----------------------------------------------------------------
commit f7626d0bfab35acd89c2c6542fc6504954191a14
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Nov 9 10:08:23 2020 +0100

    25-test_x509.t: Re-add and improve a test on non-existence of ASN.1 parse errors
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/13353)

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

Summary of changes:
 test/recipes/25-test_x509.t | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 0e3b83aedf..54fbe78e96 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -16,7 +16,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_x509");
 
-plan tests => 14;
+plan tests => 15;
 
 require_ok(srctop_file('test','recipes','tconversion.pl'));
 
@@ -124,8 +124,12 @@ sub test_errors { # actually tests diagnostics of OSSL_STORE
     return $res && $found;
 }
 
+# 3 tests for non-existence of spurious OSSL_STORE ASN.1 parse error output.
+# This requires provoking a failure exit of the app after reading input files.
+ok(test_errors("bad output format", "root-cert.pem", '-outform', 'http'),
+   "load root-cert errors");
 ok(test_errors("RC2-40-CBC", "v3-certs-RC2.p12", '-passin', 'pass:v3-certs'),
-   "load v3-certs-RC2 no asn1 errors");
+   "load v3-certs-RC2 no asn1 errors"); # error msg should mention "RC2-40-CBC"
 SKIP: {
     skip "sm2 not disabled", 1 if !disabled("sm2");