- if (!PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
- goto end;
-
- /* Skip client version and random */
- if (!PACKET_forward(&pkt, CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE))
- goto end;
-
- /* Skip session id */
- if (!PACKET_get_length_prefixed_1(&pkt, &pkt2))
- goto end;
-
- /* Skip ciphers */
- if (!PACKET_get_length_prefixed_2(&pkt, &pkt2))
- goto end;
-
- /* Skip compression */
- if (!PACKET_get_length_prefixed_1(&pkt, &pkt2))
- goto end;
-
- /* Extensions len */
- if (!PACKET_as_length_prefixed_2(&pkt, &pkt2))
+ if (!TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
+ /* Skip client version and random */
+ || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN
+ + SSL3_RANDOM_SIZE))
+ /* Skip session id */
+ || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+ /* Skip ciphers */
+ || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
+ /* Skip compression */
+ || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+ /* Extensions len */
+ || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))