From: raja-ashok <rashok.svks@gmail.com>
Date: Sun, 28 Jul 2019 07:53:00 +0000 (+0530)
Subject: Use allow_early_data_cb from SSL instead of SSL_CTX
X-Git-Tag: OpenSSL_1_1_1d~81
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=77fa495f7f7cc2368c8c799e657e173a29a90a49;p=oweals%2Fopenssl.git

Use allow_early_data_cb from SSL instead of SSL_CTX

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9471)

(cherry picked from commit 59b2cb2638dda3e07385ad36a41f0e141b36987b)
---

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;