[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e567367afd2e3339597e984fa3ae2fecad4d6735 (commit)
       via  0264910413ff7a85348cc3c35e9c59cb7906278b (commit)
      from  1e7479e8a4f33b1afa7d62b07c682f6987e6a515 (commit)


- Log -----------------------------------------------------------------
commit e567367afd2e3339597e984fa3ae2fecad4d6735
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 7 09:44:58 2021 +0200

    Added a NEWS entry about the enhanced 'openssl list'
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16522)
    
    (cherry picked from commit f43c1241c28526588f59e56c7f56422e0d23f411)

commit 0264910413ff7a85348cc3c35e9c59cb7906278b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 7 09:33:16 2021 +0200

    Add missing OSSL_DECODER entry in NEWS.md and CHANGES.md
    
    The text in CHANGES.md got fleshed out a bit more as well.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16522)
    
    (cherry picked from commit d1a786e99b162793a8f4a70fe12d2c4e6f5ee608)

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

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

diff --git a/CHANGES.md b/CHANGES.md
index 5dca90464a..0b3004d1a8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -813,8 +813,19 @@ breaking changes, and mappings for the large list of deprecated functions.
 
    *Rich Salz*
 
- * Introduced a new method type and API, OSSL_ENCODER, to
-   represent generic encoders.
+ * Introduced a new method type and API, OSSL_ENCODER, to represent
+   generic encoders.  These do the same sort of job that PEM writers
+   and d2i functions do, but with support for methods supplied by
+   providers, and the possibility for providers to support other
+   formats as well.
+
+   *Richard Levitte*
+
+ * Introduced a new method type and API, OSSL_DECODER, to represent
+   generic decoders.  These do the same sort of job that PEM readers
+   and i2d functions do, but with support for methods supplied by
+   providers, and the possibility for providers to support other
+   formats as well.
 
    *Richard Levitte*
 
diff --git a/NEWS.md b/NEWS.md
index 290671e091..011f35a849 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -28,6 +28,7 @@ OpenSSL 3.0
 
 ### Major changes between OpenSSL 1.1.1 and OpenSSL 3.0 [under development]
 
+  * Enhanced 'openssl list' with many new options.
   * Added migration guide to man7
   * Implemented support for fully "pluggable" TLSv1.3 groups
   * Added suport for Kernel TLS (KTLS)
@@ -65,6 +66,7 @@ OpenSSL 3.0
     BIOs (allowing implicit connections), and timeout checks.
   * Added util/check-format.pl for checking adherence to the coding guidelines.
   * Added OSSL_ENCODER, a generic encoder API.
+  * Added OSSL_DECODER, a generic decoder API.
   * Added OSSL_PARAM_BLD, an easier to use API to OSSL_PARAM.
   * Added error raising macros, ERR_raise() and ERR_raise_data().
   * Deprecated ERR_put_error(), ERR_get_error_line(), ERR_get_error_line_data(),