[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  51356a066e936354c817097cf873f4974bbea291 (commit)
      from  92de469fbd62a77a36dad5fde3a0ac7034071a59 (commit)


- Log -----------------------------------------------------------------
commit 51356a066e936354c817097cf873f4974bbea291
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Fri Nov 1 14:58:36 2019 +0100

    Dont pass zero length input to asm modules for ciphers
    
    The asm modules may assume an input length > 0.
    
    Fixes: #9262
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10323)

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

Summary of changes:
 providers/common/ciphers/cipher_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/providers/common/ciphers/cipher_common.c b/providers/common/ciphers/cipher_common.c
index fe4560192d..8f39a168c8 100644
--- a/providers/common/ciphers/cipher_common.c
+++ b/providers/common/ciphers/cipher_common.c
@@ -207,6 +207,8 @@ int cipher_generic_block_update(void *vctx, unsigned char *out, size_t *outl,
             ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
             return 0;
         }
+    }
+    if (nextblocks > 0) {
         if (!ctx->hw->cipher(ctx, out, in, nextblocks)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED);
             return 0;