Commit cbbe9186 authored by Rich Salz's avatar Rich Salz
Browse files

Additional check to handle BAD SSL_write retry 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3124)
parent 0856e3f1

ssl/record/rec_layer_s3.c

+2 −1
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, size_t len, 
     * promptly send beyond the end of the users buffer ... so we trap and

     * report the error in a way the user will notice

     */

    if (len < s->rlayer.wnum) {

    if ((len < s->rlayer.wnum) 

        || ((wb->left != 0) && (len < (s->rlayer.wnum + s->rlayer.wpend_tot)))) {

        SSLerr(SSL_F_SSL3_WRITE_BYTES, SSL_R_BAD_LENGTH);

        return -1;

    }