Commit c42b8a6e authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove some dead code from rec_layer_s3.c 



It is never valid to call ssl3_read_bytes with
type == SSL3_RT_CHANGE_CIPHER_SPEC, and in fact we check for valid values
for type near the beginning of the function. Therefore this check will never
be true and can be removed.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent fe81a1b0

ssl/record/rec_layer_s3.c

+0 −6
Original line number Diff line number Diff line
@@ -1159,12 +1159,6 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
     * were actually expecting a CCS).

     */



    if (rr->type == SSL3_RT_HANDSHAKE && type == SSL3_RT_CHANGE_CIPHER_SPEC) {

        al = SSL_AD_UNEXPECTED_MESSAGE;

        SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNEXPECTED_MESSAGE);

        goto f_err;

    }



    /*

     * Lets just double check that we've not got an SSLv2 record

     */