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

Change statem prefix to ossl_statem 



Change various state machine functions to use the prefix ossl_statem
instead.

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

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ int dtls1_listen(SSL *s, struct sockaddr *client) 
    SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);



    /* Put us into the "init" state so that we don't get our state cleared */

    statem_set_in_init(s, 1);

    ossl_statem_set_in_init(s, 1);



    if(BIO_dgram_get_peer(rbio, client) <= 0) {

        SSLerr(SSL_F_DTLS1_LISTEN, ERR_R_INTERNAL_ERROR);

ssl/d1_msg.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len) 
     */

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

        (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&

         statem_in_sctp_read_sock(s)))

         ossl_statem_in_sctp_read_sock(s)))

#else

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

#endif

ssl/methods.c

+36 −32
Original line number Diff line number Diff line
@@ -136,24 +136,24 @@ static const SSL_METHOD *tls1_get_method(int ver) 
}



IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, TLS_method,

                        statem_accept,

                        statem_connect, tls1_get_method, TLSv1_2_enc_data)

                        ossl_statem_accept,

                        ossl_statem_connect, tls1_get_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,

                        statem_accept,

                        statem_connect, tls1_get_method, TLSv1_2_enc_data)

                        ossl_statem_accept,

                        ossl_statem_connect, tls1_get_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,

                        statem_accept,

                        statem_connect, tls1_get_method, TLSv1_1_enc_data)

                        ossl_statem_accept,

                        ossl_statem_connect, tls1_get_method, TLSv1_1_enc_data)



IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,

                        statem_accept,

                        statem_connect, tls1_get_method, TLSv1_enc_data)

                        ossl_statem_accept,

                        ossl_statem_connect, tls1_get_method, TLSv1_enc_data)



#ifndef OPENSSL_NO_SSL3_METHOD

IMPLEMENT_ssl3_meth_func(SSLv3_method,

                         statem_accept, statem_connect, tls1_get_method)

IMPLEMENT_ssl3_meth_func(SSLv3_method, ossl_statem_accept, ossl_statem_connect,

                         tls1_get_method)

#endif
@@ -179,28 +179,28 @@ static const SSL_METHOD *tls1_get_server_method(int ver) 
}



IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, TLS_server_method,

                        statem_accept,

                        ossl_statem_accept,

                        ssl_undefined_function,

                        tls1_get_server_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,

                        statem_accept,

                        ossl_statem_accept,

                        ssl_undefined_function,

                        tls1_get_server_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method,

                        statem_accept,

                        ossl_statem_accept,

                        ssl_undefined_function,

                        tls1_get_server_method, TLSv1_1_enc_data)



IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method,

                        statem_accept,

                        ossl_statem_accept,

                        ssl_undefined_function,

                        tls1_get_server_method, TLSv1_enc_data)



#ifndef OPENSSL_NO_SSL3_METHOD

IMPLEMENT_ssl3_meth_func(SSLv3_server_method,

                         statem_accept,

                         ossl_statem_accept,

                         ssl_undefined_function, tls1_get_server_method)

#endif
@@ -228,27 +228,28 @@ static const SSL_METHOD *tls1_get_client_method(int ver) 


IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, TLS_client_method,

                        ssl_undefined_function,

                        statem_connect,

                        ossl_statem_connect,

                        tls1_get_client_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_client_method,

                        ssl_undefined_function,

                        statem_connect,

                        ossl_statem_connect,

                        tls1_get_client_method, TLSv1_2_enc_data)



IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,

                        ssl_undefined_function,

                        statem_connect,

                        ossl_statem_connect,

                        tls1_get_client_method, TLSv1_1_enc_data)



IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,

                        ssl_undefined_function,

                        statem_connect, tls1_get_client_method, TLSv1_enc_data)

                        ossl_statem_connect,

                        tls1_get_client_method, TLSv1_enc_data)



#ifndef OPENSSL_NO_SSL3_METHOD

IMPLEMENT_ssl3_meth_func(SSLv3_client_method,

                         ssl_undefined_function,

                         statem_connect, tls1_get_client_method)

                         ossl_statem_connect, tls1_get_client_method)

#endif
@@ -267,18 +268,21 @@ static const SSL_METHOD *dtls1_get_method(int ver) 


IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,

                          DTLSv1_method,

                          statem_accept,

                          statem_connect, dtls1_get_method, DTLSv1_enc_data)

                          ossl_statem_accept,

                          ossl_statem_connect,

                          dtls1_get_method, DTLSv1_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,

                          DTLSv1_2_method,

                          statem_accept,

                          statem_connect, dtls1_get_method, DTLSv1_2_enc_data)

                          ossl_statem_accept,

                          ossl_statem_connect,

                          dtls1_get_method, DTLSv1_2_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,

                          DTLS_method,

                          statem_accept,

                          statem_connect, dtls1_get_method, DTLSv1_2_enc_data)

                          ossl_statem_accept,

                          ossl_statem_connect,

                          dtls1_get_method, DTLSv1_2_enc_data)





/*
@@ -297,19 +301,19 @@ static const SSL_METHOD *dtls1_get_server_method(int ver) 


IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,

                          DTLSv1_server_method,

                          statem_accept,

                          ossl_statem_accept,

                          ssl_undefined_function,

                          dtls1_get_server_method, DTLSv1_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,

                          DTLSv1_2_server_method,

                          statem_accept,

                          ossl_statem_accept,

                          ssl_undefined_function,

                          dtls1_get_server_method, DTLSv1_2_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,

                          DTLS_server_method,

                          statem_accept,

                          ossl_statem_accept,

                          ssl_undefined_function,

                          dtls1_get_server_method, DTLSv1_2_enc_data)
@@ -331,17 +335,17 @@ static const SSL_METHOD *dtls1_get_client_method(int ver) 
IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,

                          DTLSv1_client_method,

                          ssl_undefined_function,

                          statem_connect,

                          ossl_statem_connect,

                          dtls1_get_client_method, DTLSv1_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,

                          DTLSv1_2_client_method,

                          ssl_undefined_function,

                          statem_connect,

                          ossl_statem_connect,

                          dtls1_get_client_method, DTLSv1_2_enc_data)



IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,

                          DTLS_client_method,

                          ssl_undefined_function,

                          statem_connect,

                          ossl_statem_connect,

                          dtls1_get_client_method, DTLSv1_2_enc_data)

ssl/record/rec_layer_d1.c

+4 −4
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
     */

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

        (BIO_dgram_is_sctp(SSL_get_rbio(s))

         && statem_in_sctp_read_sock(s)

         && ossl_statem_in_sctp_read_sock(s)

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

#else

    if (!s->in_handshake && SSL_in_init(s))
@@ -585,7 +585,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
         */

        if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&

            SSL3_RECORD_get_type(rr) == SSL3_RT_APPLICATION_DATA &&

            statem_in_sctp_read_sock(s)) {

            ossl_statem_in_sctp_read_sock(s)) {

            s->rwstate = SSL_READING;

            BIO_clear_retry_flags(SSL_get_rbio(s));

            BIO_set_retry_read(SSL_get_rbio(s));
@@ -903,7 +903,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 


        if (SSL_is_init_finished(s) &&

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

            statem_set_in_init(s, 1);

            ossl_statem_set_in_init(s, 1);

            s->renegotiate = 1;

            s->new_session = 1;

        }
@@ -966,7 +966,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
         */

        if (s->s3->in_read_app_data &&

            (s->s3->total_renegotiations != 0) &&

            statem_app_data_allowed(s)) {

            ossl_statem_app_data_allowed(s)) {

            s->s3->in_read_app_data = 2;

            return (-1);

        } else {

ssl/record/rec_layer_s3.c

+2 −2
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
    if ((s->rlayer.handshake_fragment_len >= 4) && !s->in_handshake) {

        if (SSL_is_init_finished(s) &&

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

            statem_set_in_init(s, 1);

            ossl_statem_set_in_init(s, 1);

            s->renegotiate = 1;

            s->new_session = 1;

        }
@@ -1450,7 +1450,7 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
         * application data at this point (session renegotiation not yet

         * started), we will indulge it.

         */

        if (statem_app_data_allowed(s)) {

        if (ossl_statem_app_data_allowed(s)) {

            s->s3->in_read_app_data = 2;

            return (-1);

        } else {