[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  992155d0ea1d59d20f0c242ea400434cd8370fe1 (commit)
       via  c0aa6b814e8f4d2c50d084a74a1908ec0f400aa0 (commit)
      from  a30b0522cb937be54e172c68b0e9f5fa6ec30bf3 (commit)


- Log -----------------------------------------------------------------
commit 992155d0ea1d59d20f0c242ea400434cd8370fe1
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 19 14:08:18 2016 +0100

    Add bwrite_conv and bread_conv values to methods_dgramp_sctp
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2116)

commit c0aa6b814e8f4d2c50d084a74a1908ec0f400aa0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 19 14:07:52 2016 +0100

    Fix erroneous goto lable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2116)

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

Summary of changes:
 crypto/bio/bss_dgram.c   | 4 ++++
 ssl/statem/statem_clnt.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 89936ff..0b1ab94 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -91,7 +91,11 @@ static const BIO_METHOD methods_dgramp = {
 static const BIO_METHOD methods_dgramp_sctp = {
     BIO_TYPE_DGRAM_SCTP,
     "datagram sctp socket",
+    /* TODO: Convert to new style write function */
+    bwrite_conv,
     dgram_sctp_write,
+    /* TODO: Convert to new style write function */
+    bread_conv,
     dgram_sctp_read,
     dgram_sctp_puts,
     NULL,                       /* dgram_gets, */
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 9b9d6cd..a80d670 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1331,7 +1331,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt)
                                        sizeof(sctpauthkey),
                                        labelbuffer,
                                        sizeof(labelbuffer), NULL, 0, 0) <= 0)
-            goto err;
+            goto f_err;
 
         BIO_ctrl(SSL_get_wbio(s),
                  BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,