[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  728d03b576f360e72bbddc7e751433575430af3b (commit)
      from  648cf9249e6ec60e0af50d5d903e05244b837cb0 (commit)


- Log -----------------------------------------------------------------
commit 728d03b576f360e72bbddc7e751433575430af3b
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Oct 28 19:35:38 2020 +1000

    afalg: add a NULL pointer check
    
    Fixes #13260
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/13261)

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

Summary of changes:
 engines/e_afalg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index 3b48ffb360..24a1aa900c 100644
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -681,6 +681,9 @@ static cbc_handles *get_cipher_handle(int nid)
 static const EVP_CIPHER *afalg_aes_cbc(int nid)
 {
     cbc_handles *cipher_handle = get_cipher_handle(nid);
+
+    if (cipher_handle == NULL)
+            return NULL;
     if (cipher_handle->_hidden == NULL
         && ((cipher_handle->_hidden =
          EVP_CIPHER_meth_new(nid,