Remove some references to rlayer.rstate

This also fixes ssl3_pending while we are at it Reviewed-by: Hugo Landau <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#18132)
t-j-h · Aug 18, 2022 · 8bbf7ef · 8bbf7ef
1 parent db1a505
commit 8bbf7ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
@@ -1265,7 +1265,15 @@ int tls_processed_read_pending(OSSL_RECORD_LAYER *rl)
 
 size_t tls_app_data_pending(OSSL_RECORD_LAYER *rl)
 {
-    return 0;
+    size_t i;
+    size_t num = 0;
+
+    for (i = rl->curr_rec; i <rl->num_recs; i++) {
+        if (rl->rrec[i].type != SSL3_RT_APPLICATION_DATA)
+            return num;
+        num += rl->rrec[i].length;
+    }
+    return num;
 }
 
 int tls_write_pending(OSSL_RECORD_LAYER *rl)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
@@ -379,11 +379,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
                 OPENSSL_cleanse(&(rr->data[rr->off]), n);
             rr->length -= n;
             rr->off += n;
-            if (rr->length == 0) {
-                /* TODO(RECLAYER): Do something with this? */
-                sc->rlayer.rstate = SSL_ST_READ_HEADER;
+            if (rr->length == 0)
                 ssl_release_record(sc, rr);
-            }
         }
 #ifndef OPENSSL_NO_SCTP
         /*

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
@@ -1357,13 +1357,8 @@ int ssl3_read_bytes(SSL *ssl, int type, int *recvd_type, unsigned char *buf,
                     OPENSSL_cleanse(&(rr->data[rr->off]), n);
                 rr->length -= n;
                 rr->off += n;
-                if (rr->length == 0) {
-                    /* TODO(RECLAYER): What to do with this? Is it needed? */
-                    #if 0
-                    s->rlayer.rstate = SSL_ST_READ_HEADER;
-                    #endif
+                if (rr->length == 0)
                     ssl_release_record(s, rr);
-                }
             }
             if (rr->length == 0
                 || (peek && n == rr->length)) {