Commit d97ce8d9 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)
parent 30699aa1

crypto/bio/bio_lib.c

+2 −2
Changes for crypto/bio/bio_lib.c: 2 added lines, 2 removed lines.
Original line number 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;

    }



    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)

            return -1;

        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);



    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;

        ret = 1;

    }