Commit 402634f8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix missing return value checks in SCTP 



There are some missing return value checks in the SCTP code. In master this
was causing a compilation failure when config'd with
"--strict-warnings sctp".

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit d8e8590e)
parent b11980d7

ssl/d1_clnt.c

+12 −4
Original line number Diff line number Diff line
@@ -350,11 +350,15 @@ int dtls1_connect(SSL *s) 
                             sizeof(DTLS1_SCTP_AUTH_LABEL),

                             DTLS1_SCTP_AUTH_LABEL);



                    SSL_export_keying_material(s, sctpauthkey,

                    if (SSL_export_keying_material(s, sctpauthkey,

                                               sizeof(sctpauthkey),

                                               labelbuffer,

                                               sizeof(labelbuffer), NULL, 0,

                                               0);

                                               0) <= 0) {

                        ret = -1;

                        s->state = SSL_ST_ERR;

                        goto end;

                    }



                    BIO_ctrl(SSL_get_wbio(s),

                             BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
@@ -484,9 +488,13 @@ int dtls1_connect(SSL *s) 
            snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),

                     DTLS1_SCTP_AUTH_LABEL);



            SSL_export_keying_material(s, sctpauthkey,

            if (SSL_export_keying_material(s, sctpauthkey,

                                       sizeof(sctpauthkey), labelbuffer,

                                       sizeof(labelbuffer), NULL, 0, 0);

                                       sizeof(labelbuffer), NULL, 0, 0) <= 0) {

                ret = -1;

                s->state = SSL_ST_ERR;

                goto end;

            }



            BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,

                     sizeof(sctpauthkey), sctpauthkey);

ssl/d1_srvr.c

+13 −5
Original line number Diff line number Diff line
@@ -405,9 +405,13 @@ int dtls1_accept(SSL *s) 
                snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),

                         DTLS1_SCTP_AUTH_LABEL);



                SSL_export_keying_material(s, sctpauthkey,

                if (SSL_export_keying_material(s, sctpauthkey,

                        sizeof(sctpauthkey), labelbuffer,

                                           sizeof(labelbuffer), NULL, 0, 0);

                        sizeof(labelbuffer), NULL, 0, 0) <= 0) {

                    ret = -1;

                    s->state = SSL_ST_ERR;

                    goto end;

                }



                BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,

                         sizeof(sctpauthkey), sctpauthkey);
@@ -628,9 +632,13 @@ int dtls1_accept(SSL *s) 
            snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),

                     DTLS1_SCTP_AUTH_LABEL);



            SSL_export_keying_material(s, sctpauthkey,

            if (SSL_export_keying_material(s, sctpauthkey,

                                       sizeof(sctpauthkey), labelbuffer,

                                       sizeof(labelbuffer), NULL, 0, 0);

                                       sizeof(labelbuffer), NULL, 0, 0) <= 0) {

                ret = -1;

                s->state = SSL_ST_ERR;

                goto end;

            }



            BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,

                     sizeof(sctpauthkey), sctpauthkey);