[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e8fb288cc5057bb198a7f1c6e46f3b64b5d7a476 (commit)
      from  1ccf49737c89cf1b37cfb0de2370f62ef136062e (commit)


- Log -----------------------------------------------------------------
commit e8fb288cc5057bb198a7f1c6e46f3b64b5d7a476
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 30 13:49:25 2019 +0100

    Fix no-srp
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8850)

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

Summary of changes:
 ssl/s3_lib.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 4ed9894..5ea2c2d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3292,18 +3292,15 @@ int ssl3_handshake_write(SSL *s)
 
 int ssl3_new(SSL *s)
 {
-
 #ifndef OPENSSL_NO_SRP
     if (!SSL_SRP_CTX_init(s))
-        goto err;
+        return 0;
 #endif
 
     if (!s->method->ssl_clear(s))
         return 0;
 
     return 1;
- err:
-    return 0;
 }
 
 void ssl3_free(SSL *s)