[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  7b72912c378bf5ae00681120924e2e450bf025f6 (commit)
      from  57a3af94a7ccff2efa99c26b2e842f520e4a731c (commit)


- Log -----------------------------------------------------------------
commit 7b72912c378bf5ae00681120924e2e450bf025f6
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Aug 15 10:20:13 2019 +0200

    crypto/engine/eng_openssl.c: define TEST_ENG_OPENSSL_RC4_P_INIT conditionally
    
    When OpenSSL is configured with 'no-stdio', TEST_ENG_OPENSSL_RC4_P_INIT
    shouldn't be defined, as that test uses stdio.
    
    Fixes #9597
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9598)
    
    (cherry picked from commit 9f643f54236d6cf0d0d24327acd3b858883f0686)

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

Summary of changes:
 crypto/engine/eng_openssl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index f7ad7a5f46..0ec56ed4af 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -29,12 +29,14 @@
  */
 #define TEST_ENG_OPENSSL_RC4
 #ifndef OPENSSL_NO_STDIO
-#define TEST_ENG_OPENSSL_PKEY
+# define TEST_ENG_OPENSSL_PKEY
 #endif
 /* #define TEST_ENG_OPENSSL_HMAC */
 /* #define TEST_ENG_OPENSSL_HMAC_INIT */
 /* #define TEST_ENG_OPENSSL_RC4_OTHERS */
-#define TEST_ENG_OPENSSL_RC4_P_INIT
+#ifndef OPENSSL_NO_STDIO
+# define TEST_ENG_OPENSSL_RC4_P_INIT
+#endif
 /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */
 #define TEST_ENG_OPENSSL_SHA
 /* #define TEST_ENG_OPENSSL_SHA_OTHERS */