Commit 42bd7a16 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add an error to the stack on failure in dtls1_write_bytes() 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3496)
parent b77f3ed1

include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -2259,6 +2259,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_DTLS1_READ_FAILED                          339

# define SSL_F_DTLS1_RETRANSMIT_MESSAGE                   390

# define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 268

# define SSL_F_DTLS1_WRITE_BYTES                          545

# define SSL_F_DTLSV1_LISTEN                              350

# define SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC          371

# define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST        385

ssl/record/rec_layer_d1.c

+3 −1
Original line number Diff line number Diff line
@@ -732,8 +732,10 @@ int dtls1_write_bytes(SSL *s, int type, const void *buf, size_t len, 
{

    int i;



    if (!ossl_assert(len <= SSL3_RT_MAX_PLAIN_LENGTH))

    if (!ossl_assert(len <= SSL3_RT_MAX_PLAIN_LENGTH)) {

        SSLerr(SSL_F_DTLS1_WRITE_BYTES, ERR_R_INTERNAL_ERROR);

        return -1;

    }

    s->rwstate = SSL_NOTHING;

    i = do_dtls1_write(s, type, buf, len, 0, written);

    return i;

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_DTLS1_RETRANSMIT_MESSAGE), "dtls1_retransmit_message"},

    {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES),

     "dtls1_write_app_data_bytes"},

    {ERR_FUNC(SSL_F_DTLS1_WRITE_BYTES), "dtls1_write_bytes"},

    {ERR_FUNC(SSL_F_DTLSV1_LISTEN), "DTLSv1_listen"},

    {ERR_FUNC(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC),

     "dtls_construct_change_cipher_spec"},