[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a4e440d6477b40b04ce825dae14c7f27778ca8f1 (commit)
       via  00493490ddd824932d2019de4a73175cb50d7b95 (commit)
      from  96786ad12308215621142f7cb2ef21a9aca30665 (commit)


- Log -----------------------------------------------------------------
commit a4e440d6477b40b04ce825dae14c7f27778ca8f1
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Tue Jun 16 23:50:26 2020 +0200

    TEST: Pass -no-CAstore in 80-test_ocsp.t
    
    Without passing -no-CAstore the default CAstore will be used and the
    testsuite will fail the system has certificates installed.
    
    Fixes: #11645
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12171)

commit 00493490ddd824932d2019de4a73175cb50d7b95
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Tue Jun 16 23:47:48 2020 +0200

    APPS: Properly pass -no-CAstore
    
    Since its introduction the option no-CAstore maps to OPT_NOCAPATH and so
    behaves like -no-CApath.
    
    Map no-CAstore to OPT_NOCASTORE.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12171)

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

Summary of changes:
 apps/ocsp.c                 | 2 +-
 apps/verify.c               | 2 +-
 test/recipes/80-test_ocsp.t | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 6095e6b2f6..4660a7fe5a 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -117,7 +117,7 @@ const OPTIONS ocsp_options[] = {
      "Do not load the default certificates file"},
     {"no-CApath", OPT_NOCAPATH, '-',
      "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCAPATH, '-',
+    {"no-CAstore", OPT_NOCASTORE, '-',
      "Do not load certificates from the default certificates store"},
 
     OPT_SECTION("Responder"),
diff --git a/apps/verify.c b/apps/verify.c
index e0eaaabe20..eee81799bf 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -60,7 +60,7 @@ const OPTIONS verify_options[] = {
      "Do not load the default trusted certificates file"},
     {"no-CApath", OPT_NOCAPATH, '-',
      "Do not load trusted certificates from the default directory"},
-    {"no-CAstore", OPT_NOCAPATH, '-',
+    {"no-CAstore", OPT_NOCASTORE, '-',
      "Do not load trusted certificates from the default certificates store"},
     {"untrusted", OPT_UNTRUSTED, '<', "A file of untrusted certificates"},
     {"CRLfile", OPT_CRLFILE, '<',
diff --git a/test/recipes/80-test_ocsp.t b/test/recipes/80-test_ocsp.t
index 3aedd093e5..3727c360ba 100644
--- a/test/recipes/80-test_ocsp.t
+++ b/test/recipes/80-test_ocsp.t
@@ -45,7 +45,7 @@ sub test_ocsp {
                            "-partial_chain", @check_time,
                            "-CAfile", catfile($ocspdir, $CAfile),
                            "-verify_other", catfile($ocspdir, $untrusted),
-                           "-no-CApath"])),
+                           "-no-CApath", "-no-CAstore"])),
                   $title); });
 }