[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  7bfd934049021ebf56db3f9670961c958104445d (commit)
      from  ecabd006444d1134d2e4c8475f9abf40c4a38708 (commit)


- Log -----------------------------------------------------------------
commit 7bfd934049021ebf56db3f9670961c958104445d
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Wed Nov 4 12:25:58 2020 +0300

    Check the configuration file by default
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13310)

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

Summary of changes:
 apps/openssl-vms.cnf | 4 ++++
 apps/openssl.cnf     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apps/openssl-vms.cnf b/apps/openssl-vms.cnf
index ca21149efd..f18e63c351 100644
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -16,6 +16,10 @@ HOME			= .
  # Use this in order to automatically load providers.
 openssl_conf = openssl_init
 
+# Comment this out if you deliberately want to ignore
+# configuration errors
+config_diagnostics = 1
+
 # Extra OBJECT IDENTIFIER info:
 # oid_file       = $ENV::HOME/.oid
 oid_section = new_oids
diff --git a/apps/openssl.cnf b/apps/openssl.cnf
index 3e8c0cbb2c..97567a67be 100644
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -16,6 +16,10 @@ HOME			= .
  # Use this in order to automatically load providers.
 openssl_conf = openssl_init
 
+# Comment this out if you deliberately want to ignore
+# configuration errors
+config_diagnostics = 1
+
 # Extra OBJECT IDENTIFIER info:
 # oid_file       = $ENV::HOME/.oid
 oid_section = new_oids