fix(sidetrail): Invalid stream cipher struct in proof wrapper

tests/sidetrail/working/s2n-record-read-stream/copy_as_needed.sh

@@ -40,10 +40,9 @@ cp $S2N_BASE/stuffer/s2n_stuffer.c stuffer/
 cp $S2N_BASE/stuffer/s2n_stuffer_network_order.c stuffer/
 
 mkdir -p tls
-#add invariants etc needed for the proof to the s2n_cbc code
-cp $S2N_BASE/tls/s2n_cbc.c tls/
+#add invariants etc needed for the proof
 cp $S2N_BASE/tls/s2n_record_read_stream.c tls/
-patch -p5 < ../patches/cbc.patch
+patch -p1 < s2n_record_read_stream.patch
 
 mkdir -p utils
 cp $S2N_BASE/utils/s2n_result.c utils/

tests/sidetrail/working/s2n-record-read-stream/s2n_record_read_stream.patch

@@ -0,0 +1,14 @@
+diff --git a/tls/s2n_record_read_stream.c b/tls/s2n_record_read_stream.c
+index f40621b..06871ed 100644
+--- a/tls/s2n_record_read_stream.c
++++ b/tls/s2n_record_read_stream.c
+@@ -80,6 +80,9 @@ int s2n_record_parse_stream(
+         POSIX_BAIL(S2N_ERR_BAD_MESSAGE);
+     }
+
++    /* All information is declassified after the MAC is successfully verified. */
++    __VERIFIER_assume(0);
++
+     /* O.k., we've successfully read and decrypted the record, now we need to align the stuffer
+      * for reading the plaintext data.
+      */

tests/sidetrail/working/s2n-record-read-stream/s2n_record_read_wrapper.c

@@ -99,7 +99,7 @@ int s2n_record_parse_wrapper(int *xor_pad,
 
   struct s2n_cipher stream_cipher = {
     .type = S2N_STREAM,
-    .io.cbc.decrypt = decrypt_stream,
+    .io.stream.decrypt = decrypt_stream,
   };
 
   struct s2n_record_algorithm record_algorithm = {