[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  3f8907e459313f0b3df3b328f0a16db565fbcea0 (commit)
      from  bdbf2df2e685ae653f3c683ce2f734eb0c0888e0 (commit)


- Log -----------------------------------------------------------------
commit 3f8907e459313f0b3df3b328f0a16db565fbcea0
Author: Xiaokang Qian <xiaokang.qian at arm.com>
Date:   Tue Nov 12 08:48:27 2019 +0000

    Fix the issue that aes-xxx-siv algorithms failed in OpenSSL speed test
    
    Speed test, aes-siv related cases fail on both x86 and arm.
    The return value of siv_init() causes this problem, remove
    the iv check to fix it.
    Verify it locally, the result is pass.
    
    Fixes #10416
    
    Change-Id: If1a18599f3d0f56f22a1ce4f8f114b8db0f68cca
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10419)

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

Summary of changes:
 providers/implementations/ciphers/cipher_aes_siv.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c
index 6a5d211a7d..18be36e9b3 100644
--- a/providers/implementations/ciphers/cipher_aes_siv.c
+++ b/providers/implementations/ciphers/cipher_aes_siv.c
@@ -49,9 +49,6 @@ static int siv_init(void *vctx, const unsigned char *key, size_t keylen,
 
     ctx->enc = enc;
 
-    if (iv != NULL)
-        return 0;
-
     if (key != NULL) {
         if (keylen != ctx->keylen) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);