Commit 024f543c authored by Matt Caswell's avatar Matt Caswell
Browse files

Move in_handshake into STATEM 



The SSL variable |in_handshake| seems misplaced. It would be better to have
it in the STATEM structure.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 20dbe585

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ int dtls1_heartbeat(SSL *s) 
    }



    /* ...and no handshake in progress. */

    if (SSL_in_init(s) || s->in_handshake) {

    if (SSL_in_init(s) || ossl_statem_get_in_handshake(s)) {

        SSLerr(SSL_F_DTLS1_HEARTBEAT, SSL_R_UNEXPECTED_MESSAGE);

        return -1;

    }

ssl/d1_msg.c

+2 −2
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len) 
     * Check if we have to continue an interrupted handshake for reading

     * belated app data with SCTP.

     */

    if ((SSL_in_init(s) && !s->in_handshake) ||

    if ((SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) ||

        (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&

         ossl_statem_in_sctp_read_sock(s)))

#else

    if (SSL_in_init(s) && !s->in_handshake)

    if (SSL_in_init(s) && !ossl_statem_get_in_handshake(s))

#endif

    {

        i = s->handshake_func(s);

ssl/record/rec_layer_d1.c

+5 −5
Original line number Diff line number Diff line
@@ -439,12 +439,12 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
     * Continue handshake if it had to be interrupted to read app data with

     * SCTP.

     */

    if ((!s->in_handshake && SSL_in_init(s)) ||

    if ((!ossl_statem_get_in_handshake(s) && SSL_in_init(s)) ||

        (BIO_dgram_is_sctp(SSL_get_rbio(s))

         && ossl_statem_in_sctp_read_sock(s)

         && s->s3->in_read_app_data != 2))

#else

    if (!s->in_handshake && SSL_in_init(s))

    if (!ossl_statem_get_in_handshake(s) && SSL_in_init(s))

#endif

    {

        /* type == SSL3_RT_APPLICATION_DATA */
@@ -878,7 +878,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
     * Unexpected handshake message (Client Hello, or protocol violation)

     */

    if ((s->rlayer.d->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&

        !s->in_handshake) {

        !ossl_statem_get_in_handshake(s)) {

        struct hm_header_st msg_hdr;



        /* this may just be a stale retransmit */
@@ -950,8 +950,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
    case SSL3_RT_HANDSHAKE:

        /*

         * we already handled all of these, with the possible exception of

         * SSL3_RT_HANDSHAKE when s->in_handshake is set, but that should not

         * happen when type != rr->type

         * SSL3_RT_HANDSHAKE when ossl_statem_get_in_handshake(s) is true, but

         * that should not happen when type != rr->type

         */

        al = SSL_AD_UNEXPECTED_MESSAGE;

        SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);

ssl/record/rec_layer_s3.c

+6 −5
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) 
    tot = s->rlayer.wnum;

    s->rlayer.wnum = 0;



    if (SSL_in_init(s) && !s->in_handshake) {

    if (SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) {

        i = s->handshake_func(s);

        if (i < 0)

            return (i);
@@ -1025,7 +1025,7 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
     * Now s->rlayer.handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE.

     */



    if (!s->in_handshake && SSL_in_init(s)) {

    if (!ossl_statem_get_in_handshake(s) && SSL_in_init(s)) {

        /* type == SSL3_RT_APPLICATION_DATA */

        i = s->handshake_func(s);

        if (i < 0)
@@ -1383,7 +1383,8 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
    /*

     * Unexpected handshake message (Client Hello, or protocol violation)

     */

    if ((s->rlayer.handshake_fragment_len >= 4) && !s->in_handshake) {

    if ((s->rlayer.handshake_fragment_len >= 4)

            && !ossl_statem_get_in_handshake(s)) {

        if (SSL_is_init_finished(s) &&

            !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) {

            ossl_statem_set_in_init(s, 1);
@@ -1436,8 +1437,8 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
    case SSL3_RT_HANDSHAKE:

        /*

         * we already handled all of these, with the possible exception of

         * SSL3_RT_HANDSHAKE when s->in_handshake is set, but that should not

         * happen when type != rr->type

         * SSL3_RT_HANDSHAKE when ossl_statem_get_in_handshake(s) is true, but

         * that should not happen when type != rr->type

         */

        al = SSL_AD_UNEXPECTED_MESSAGE;

        SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);

ssl/record/ssl3_record.c

+1 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ int dtls1_get_record(SSL *s) 
     * processed at this time.

     */

    if (is_next_epoch) {

        if ((SSL_in_init(s) || s->in_handshake)) {

        if ((SSL_in_init(s) || ossl_statem_get_in_handshake(s))) {

            if (dtls1_buffer_record

                (s, &(DTLS_RECORD_LAYER_get_unprocessed_rcds(&s->rlayer)),

                rr->seq_num) < 0)