Commit 829754a6 authored by Matt Caswell's avatar Matt Caswell
Browse files

Various style fixes from the TLSv1.3 record changes review 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 88858868

ssl/packet.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes) 
            return 0;

    }

    if (allocbytes != NULL)

        *allocbytes = GETBUF(pkt) + pkt->curr;

        *allocbytes = WPACKET_get_curr(pkt);



    return 1;

}

ssl/record/rec_layer_s3.c

+2 −6
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
    unsigned char *recordstart;

    int i, mac_size, clear = 0;

    size_t prefix_len = 0;

    int eivlen;

    int eivlen = 0;

    size_t align = 0;

    SSL3_BUFFER *wb;

    SSL_SESSION *sess;
@@ -776,11 +776,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
            eivlen = EVP_GCM_TLS_EXPLICIT_IV_LEN;

        } else if (mode == EVP_CIPH_CCM_MODE) {

            eivlen = EVP_CCM_TLS_EXPLICIT_IV_LEN;

        } else {

            eivlen = 0;

        }

    } else {

        eivlen = 0;

    }



    totlen = 0;