Move some DTLS read code into the read record layer

Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #18132)
openssl · Aug 18, 2022 · eddb067 · eddb067 · gvanem · Aug 28, 2022
1 parent 8124ab5
commit eddb067
Show file tree

Hide file tree

Showing 19 changed files with 1,027 additions and 909 deletions.
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
@@ -848,6 +848,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
         BIO_ADDR_clear(client);
 
     /* Buffer the record in the processed_rcds queue */
+    /* TODO(RECLAYER): This is nasty and reaches inside the record layer. FIXME */
     if (!dtls_buffer_listen_record(s, reclen, seq, align))
         return -1;
 

diff --git a/ssl/record/build.info b/ssl/record/build.info
@@ -12,7 +12,7 @@ ENDIF
 
 SOURCE[../../libssl]=\
         rec_layer_s3.c rec_layer_d1.c ssl3_buffer.c  ssl3_record.c \
-        dtls1_bitmap.c ssl3_record_tls13.c
+        ssl3_record_tls13.c
 
 # For shared builds we need to include the sources needed in providers
 # (tls_pad.c) in libssl as well.

diff --git a/ssl/record/methods/build.info b/ssl/record/methods/build.info
@@ -5,7 +5,7 @@ ENDIF
 
 SOURCE[../../../libssl]=\
         tls_common.c ssl3_meth.c tls1_meth.c tls13_meth.c tlsany_meth.c \
-        $KTLSSRC
+        dtls_meth.c $KTLSSRC
 
 # For shared builds we need to include the sources needed in providers
 # (ssl3_cbc.c) in libssl as well.