[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c1aba0763c477f345c065007ff6295dbe6ec4f64 (commit)
      from  c88f6f0e408328e13e9ad61b9658114cddbaba92 (commit)


- Log -----------------------------------------------------------------
commit c1aba0763c477f345c065007ff6295dbe6ec4f64
Author: Richard Levitte <levi...@openssl.org>
Date:   Thu Sep 10 13:50:54 2020 +0200

    OSSL_DECODER 'decode' function must never be NULL.
    
    The conditions for a valid implementation allowed the 'decode'
    function to be NULL or the 'export_object' was NULL.  That condition
    is changed so that 'decode' is checked to be non-NULL by itself.
    
    Fixes #12819
    
    Reviewed-by: Tim Hudson <t...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12849)

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

Summary of changes:
 crypto/encode_decode/decoder_meth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/encode_decode/decoder_meth.c 
b/crypto/encode_decode/decoder_meth.c
index 235899b6ce..41406df90f 100644
--- a/crypto/encode_decode/decoder_meth.c
+++ b/crypto/encode_decode/decoder_meth.c
@@ -215,7 +215,7 @@ void *ossl_decoder_from_dispatch(int id, const 
OSSL_ALGORITHM *algodef,
      */
     if (!((decoder->newctx == NULL && decoder->freectx == NULL)
           || (decoder->newctx != NULL && decoder->freectx != NULL))
-        || (decoder->decode == NULL && decoder->export_object == NULL)) {
+        || decoder->decode == NULL) {
         OSSL_DECODER_free(decoder);
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROVIDER_FUNCTIONS);
         return NULL;