]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
fuzz: fix coverity warnings
authorPhilippe Antoine <p.antoine@catenacyber.fr>
Thu, 9 Feb 2023 14:21:59 +0000 (15:21 +0100)
committerTodd Short <todd.short@me.com>
Mon, 20 Feb 2023 15:04:30 +0000 (10:04 -0500)
introduced by 2b9e2afc382490592078cdb69d06f54f0fefd4c6

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/20253)

ssl/record/methods/tls_common.c
ssl/statem/extensions_srvr.c
ssl/statem/statem_lib.c

index 69745f902bdf819133980d8ef784911df6a6f434..ab1905903004071b7d4495881bb4e38c235edb5c 100644 (file)
@@ -865,7 +865,8 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             if (thisrr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + mac_size)
                 enc_err = 0;
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-            if (enc_err == 0 && mac_size > 0 && (md[0] ^ thismb->mac[0]) != 0xFF) {
+            if (enc_err == 0 && mac_size > 0 && thismb != NULL &&
+                thismb->mac != NULL && (md[0] ^ thismb->mac[0]) != 0xFF) {
                 enc_err = 1;
             }
 #endif
index 0af0d2fe627d59107c0d8afd314125a9e21c59a5..a0a48e405fb2ed821a43692817169ab4014177df 100644 (file)
@@ -63,7 +63,7 @@ int tls_parse_ctos_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
                     s->s3.previous_client_finished_len);
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     if (ok) {
-        if (data[0] ^ s->s3.previous_client_finished[0] != 0xFF) {
+        if ((data[0] ^ s->s3.previous_client_finished[0]) != 0xFF) {
             ok = 0;
         }
     }
index 1812ca63d16deffbad574fd6ebbcc12a162c78b8..88f3b94f2e2b4d23e314b5779a329b19248a8e46 100644 (file)
@@ -836,7 +836,7 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
                        md_len);
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     if (ok != 0) {
-        if (PACKET_data(pkt)[0] ^ s->s3.tmp.peer_finish_md[0] != 0xFF) {
+        if ((PACKET_data(pkt)[0] ^ s->s3.tmp.peer_finish_md[0]) != 0xFF) {
             ok = 0;
         }
     }