generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation problems with SCTP

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

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-11-06 10:25:08 +00:00
parent 8d16c58fa4
commit d99b0691d3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/statem/statem.c
View File

@@ -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) * 1: Yes (we are in the read sock state)
* 0: No (we are not 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; return s->statem.in_sctp_read_sock;
} }

6
ssl/statem/statem_srvr.c
View File

@@ -868,10 +868,10 @@ WORK_STATE ossl_statem_server_post_process_message(SSL *s, WORK_STATE wst)
s->rwstate = SSL_READING; s->rwstate = SSL_READING;
BIO_clear_retry_flags(SSL_get_rbio(s)); BIO_clear_retry_flags(SSL_get_rbio(s));
BIO_set_retry_read(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; return WORK_MORE_A;
} else { } else {
ossl_ossl_statem_set_sctp_read_sock(s, 0); ossl_statem_set_sctp_read_sock(s, 0);
} }
#endif #endif
return WORK_FINISHED_CONTINUE; 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; s->rwstate = SSL_READING;
BIO_clear_retry_flags(SSL_get_rbio(s)); BIO_clear_retry_flags(SSL_get_rbio(s));
BIO_set_retry_read(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; return WORK_MORE_B;
} else { } else {
ossl_statem_set_sctp_read_sock(s, 0); ossl_statem_set_sctp_read_sock(s, 0);