[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8dab4de53887639abc1152288fac76506beb87b3 (commit)
      from  ecca5b6e2ea5f364e4281193fd1526fbaf3f8248 (commit)


- Log -----------------------------------------------------------------
commit 8dab4de53887639abc1152288fac76506beb87b3
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jul 16 09:34:00 2020 +0200

    Add latest changes and news in CHANGES.md and NEWS.md
    
    - Reworked test perl framwork for parallel tests
    - Reworked ERR codes to make better space for system errors
    - Deprecation of the ENGINE API
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12461)

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

Summary of changes:
 CHANGES.md | 15 +++++++++++++++
 NEWS.md    |  1 +
 2 files changed, 16 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 68d269cb5d..a7cb2c5bb1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,21 @@ OpenSSL 3.0
 
 ### Changes between 1.1.1 and 3.0 [xx XXX xxxx]
 
+ * Deprecated the `ENGINE` API.  Engines should be replaced with providers
+   going forward.
+
+   *Paul Dale*
+
+ * Reworked the recorded ERR codes to make better space for system errors.
+   To distinguish them, the macro `ERR_SYSTEM_ERROR()` indicates if the
+   given code is a system error (true) or an OpenSSL error (false).
+
+   *Richard Levitte*
+
+ * Reworked the test perl framework to better allow parallel testing.
+
+   *Nicola Tuveri and David von Oheimb*
+
  * Added ciphertext stealing algorithms AES-128-CBC-CTS, AES-192-CBC-CTS and
    AES-256-CBC-CTS to the providers. CS1, CS2 and CS3 variants are supported.
 
diff --git a/NEWS.md b/NEWS.md
index e04e5b95c8..ed99e8cd00 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -20,6 +20,7 @@ OpenSSL 3.0
 
 ### Major changes between OpenSSL 1.1.1 and OpenSSL 3.0 [under development]
 
+  * Deprecated the `ENGINE` API.
   * Added `OPENSSL_CTX`, a libcrypto library context.
   * Interactive mode is removed from the 'openssl' program.
   * The X25519, X448, Ed25519, Ed448 and SHAKE256 algorithms are included in