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

Fix compilation problems with SCTP 



The SCTP code is not compiled by default. This fixes some compilation
problems in that code.

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

ssl/statem/statem.c

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ void ossl_statem_set_sctp_read_sock(SSL *s, int read_sock) 
 *   1: Yes (we are in the read sock state)

 *   0: No (we are not in the read sock state)

 */

int statem_in_sctp_read_sock(SSL *s)

int ossl_statem_in_sctp_read_sock(SSL *s)

{

    return s->statem.in_sctp_read_sock;

}

ssl/statem/statem_srvr.c

+3 −3
Original line number Diff line number Diff line
@@ -868,10 +868,10 @@ WORK_STATE ossl_statem_server_post_process_message(SSL *s, WORK_STATE wst) 
            s->rwstate = SSL_READING;

            BIO_clear_retry_flags(SSL_get_rbio(s));

            BIO_set_retry_read(SSL_get_rbio(s));

            statem_set_sctp_read_sock(s, 1);

            ossl_statem_set_sctp_read_sock(s, 1);

            return WORK_MORE_A;

        } else {

            ossl_ossl_statem_set_sctp_read_sock(s, 0);

            ossl_statem_set_sctp_read_sock(s, 0);

        }

#endif

        return WORK_FINISHED_CONTINUE;
@@ -2927,7 +2927,7 @@ WORK_STATE tls_post_process_client_key_exchange(SSL *s, WORK_STATE wst) 
        s->rwstate = SSL_READING;

        BIO_clear_retry_flags(SSL_get_rbio(s));

        BIO_set_retry_read(SSL_get_rbio(s));

        statem_set_sctp_read_sock(s, 1);

        ossl_statem_set_sctp_read_sock(s, 1);

        return WORK_MORE_B;

    } else {

        ossl_statem_set_sctp_read_sock(s, 0);