[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  59b2cb2638dda3e07385ad36a41f0e141b36987b (commit)
      from  0c789f59f117ccbb30ffc621216ba776117c7c61 (commit)


- Log -----------------------------------------------------------------
commit 59b2cb2638dda3e07385ad36a41f0e141b36987b
Author: raja-ashok <rashok.svks at gmail.com>
Date:   Sun Jul 28 13:23:00 2019 +0530

    Use allow_early_data_cb from SSL instead of SSL_CTX
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9471)

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

Summary of changes:
 ssl/statem/extensions.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 4941da3ede..7c1759312f 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1645,9 +1645,9 @@ static int final_early_data(SSL *s, unsigned int context, int sent)
             || s->early_data_state != SSL_EARLY_DATA_ACCEPTING
             || !s->ext.early_data_ok
             || s->hello_retry_request != SSL_HRR_NONE
-            || (s->ctx->allow_early_data_cb != NULL
-                && !s->ctx->allow_early_data_cb(s,
-                                         s->ctx->allow_early_data_cb_data))) {
+            || (s->allow_early_data_cb != NULL
+                && !s->allow_early_data_cb(s,
+                                         s->allow_early_data_cb_data))) {
         s->ext.early_data = SSL_EARLY_DATA_REJECTED;
     } else {
         s->ext.early_data = SSL_EARLY_DATA_ACCEPTED;