[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d99b0691d3a5d215e8d4dbe1b7224e066153fe2c (commit)
      from  8d16c58fa4d4ef1d6394c2a6ad5ca93c095808e6 (commit)


- Log -----------------------------------------------------------------
commit d99b0691d3a5d215e8d4dbe1b7224e066153fe2c
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Nov 6 10:25:08 2015 +0000

    Fix compilation problems with SCTP
    
    The SCTP code is not compiled by default. This fixes some compilation
    problems in that code.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c      | 2 +-
 ssl/statem/statem_srvr.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 3a44846..bc3fc54 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -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;
 }
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 0689da0..e54672a 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -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);