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

Fix ssl3_read_bytes handshake fragment bug 



The move of CCS into the state machine introduced a bug in ssl3_read_bytes.
The value of |recvd_type| was not being set if we are satisfying the request
from handshake fragment storage. This can occur, for example, with
renegotiation and causes the handshake to fail.

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

ssl/record/rec_layer_s3.c

+4 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,10 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
        /* move any remaining fragment bytes: */

        for (k = 0; k < s->rlayer.handshake_fragment_len; k++)

            s->rlayer.handshake_fragment[k] = *src++;



        if (recvd_type != NULL)

            *recvd_type = SSL3_RT_HANDSHAKE;



        return n;

    }