[qpid-proton] branch main updated: PROTON-2736: tls library - stay in decrypt loop long enough to finalize reads and state vars

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cliffjansen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/main by this push:
     new e637082ac PROTON-2736: tls library - stay in decrypt loop long enough to finalize reads and state vars
e637082ac is described below

commit e637082ac62c6caefbc3ac94ef01e98a3c0b5902
Author: Clifford Jansen <cl...@apache.org>
AuthorDate: Sun May 14 16:16:26 2023 -0700

    PROTON-2736: tls library - stay in decrypt loop long enough to finalize reads and state vars
---
 c/src/tls/openssl.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/c/src/tls/openssl.c b/c/src/tls/openssl.c
index 2ed4d5298..0c3b6bd66 100644
--- a/c/src/tls/openssl.c
+++ b/c/src/tls/openssl.c
@@ -2166,9 +2166,6 @@ static void decrypt(pn_tls_t *tls) {
       }
     }
 
-    if (tls->pn_tls_err || tls->dec_closed)
-      return;
-
     // Done if not possible to move any more bytes from input to output bufs
     if ( (tls->dec_closed || !pending || tls->dec_wblocked) /* write side */ &&
          (!curr_result || tls->dec_rblocked) ) /* read side */ {
@@ -2181,8 +2178,6 @@ static void decrypt(pn_tls_t *tls) {
         tls->dec_rpending = (pcount == 1);
         if (pcount <= 0) {
           check_error_reason(tls, pcount);
-          if (tls->pn_tls_err || tls->dec_closed)
-            return;
         }
 
         // Peek may have made more room in buffer (i.e. handshake followed by large


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org