Commit 90893527 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix the BIO callback return code handling 



The BIO callback handling incorrectly wrote over the return code passed
to the callback, meaning that an incorrect result was (eventually) returned
to the caller.

Fixes #7343

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

(cherry picked from commit d97ce8d9a0619c1d9d1222dc1b44dbebb58dd966)
parent 236119c4

crypto/bio/bio_lib.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len, 
        argi = (int)len;

        argi = (int)len;

    }

    }





    if (inret && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) {

    if (inret > 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) {

        if (*processed > INT_MAX)

        if (*processed > INT_MAX)

            return -1;

            return -1;

        inret = *processed;

        inret = *processed;
@@ -60,7 +60,7 @@ static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len, 




    ret = b->callback(b, oper, argp, argi, argl, inret);

    ret = b->callback(b, oper, argp, argi, argl, inret);





    if (ret >= 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) {

    if (ret > 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) {

        *processed = (size_t)ret;

        *processed = (size_t)ret;

        ret = 1;

        ret = 1;

    }

    }