[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2d9007587c5072a513c84f22db7be55767b4c63d (commit)
      from  cb1548bc5f207978f6ba287040eaea25c34b5786 (commit)


- Log -----------------------------------------------------------------
commit 2d9007587c5072a513c84f22db7be55767b4c63d
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 28 14:31:39 2019 +0100

    Fix no-ec
    
    A test in sslapitest.c was failing in a no-ec build because we were using
    an EC based ciphersuite. That particular test doesn't require EC
    specifically, so we swap to a non EC based ciphersuite.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9716)

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

Summary of changes:
 test/sslapitest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 2066448926..4b510eb3f7 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -3937,11 +3937,11 @@ static int test_tls13_ciphersuite(int idx)
             break;
         case 2:
             set_at_ctx = 1;
-            t12_cipher = TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
+            t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
             break;
         case 3:
             set_at_ssl = 1;
-            t12_cipher = TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
+            t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
             break;
     }