Blob Initialization fix.

aws · Jan 4, 2023 · c4cf15b · c4cf15b
1 parent c7e1006
commit c4cf15b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/tls/s2n_record_read_composite.c b/tls/s2n_record_read_composite.c
@@ -36,16 +36,14 @@ int s2n_record_parse_composite(
         struct s2n_session_key *session_key)
 {
     /* Don't reduce encrypted length for explicit IV, composite decrypt expects it */
-    struct s2n_blob iv = { 0 };
-    s2n_blob_init(&iv, implicit_iv, cipher_suite->record_alg->cipher->io.comp.record_iv_size);
+    struct s2n_blob iv = { .data = implicit_iv, .size = cipher_suite->record_alg->cipher->io.comp.record_iv_size };
     uint8_t ivpad[S2N_TLS_MAX_IV_LEN];
 
     /* Add the header to the HMAC */
     uint8_t *header = s2n_stuffer_raw_read(&conn->header_in, S2N_TLS_RECORD_HEADER_LENGTH);
     POSIX_ENSURE_REF(header);
 
-    struct s2n_blob en = { 0 };
-    s2n_blob_init(&en, s2n_stuffer_raw_read(&conn->in, encrypted_length), encrypted_length);
+    struct s2n_blob en = { .size = encrypted_length, .data = s2n_stuffer_raw_read(&conn->in, encrypted_length) };
     POSIX_ENSURE_REF(en.data);
 
     uint16_t payload_length = encrypted_length;
@@ -90,8 +88,7 @@ int s2n_record_parse_composite(
     POSIX_GUARD(s2n_sub_overflow(payload_length, en.data[en.size - 1] + 1, &out));
     payload_length = out;
 
-    struct s2n_blob seq = { 0 };
-    s2n_blob_init(&seq, sequence_number, S2N_TLS_SEQUENCE_NUM_LEN);
+    struct s2n_blob seq = { .data = sequence_number, .size = S2N_TLS_SEQUENCE_NUM_LEN };
     POSIX_GUARD(s2n_increment_sequence_number(&seq));
 
     /* O.k., we've successfully read and decrypted the record, now we need to align the stuffer