[CVE-2020-15078] Potentially tigger further information leaks

Change-Id: I80fb5485421db74fc736ef8c61a1a96a2aaaca0f

diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index 6a30e47..cb0ae41 100644 (file)
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -634,6 +634,7 @@ int
 process_incoming_push_request(struct context *c)
 {
     int ret = PUSH_MSG_ERROR;
+    struct key_state *ks = &c->c2.tls_multi->session[TM_ACTIVE].key[KS_PRIMARY];
 
 #ifdef ENABLE_ASYNC_PUSH
     c->c2.push_request_received = true;
@@ -644,7 +645,12 @@ process_incoming_push_request(struct context *c)
         send_auth_failed(c, client_reason);
         ret = PUSH_MSG_AUTH_FAILURE;
     }
-    else if (!c->c2.push_reply_deferred && c->c2.context_auth == CAS_SUCCEEDED)
+    else if (!c->c2.push_reply_deferred && c->c2.context_auth == CAS_SUCCEEDED
+             && ks->authenticated
+ #ifdef ENABLE_DEF_AUTH
+             && !ks->auth_deferred
+ #endif
+             )
     {
         time_t now;