[openssl] OpenSSL_1_1_1-stable update

Dr. Paul Dale pauli at openssl.org
Thu Aug 1 01:40:04 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  77fa495f7f7cc2368c8c799e657e173a29a90a49 (commit)
      from  a5c83db4ae3b3a94cdb88658280c36b6a74377ef (commit)


- Log -----------------------------------------------------------------
commit 77fa495f7f7cc2368c8c799e657e173a29a90a49
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)
    
    (cherry picked from commit 59b2cb2638dda3e07385ad36a41f0e141b36987b)

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

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 7aa475038e..49176be2d2 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1648,9 +1648,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;


More information about the openssl-commits mailing list