mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-03 05:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Teach more BIOs how to handle BIO_CTRL_EOF

Browse Source 
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10907)
This commit is contained in:
Matt Caswell 2020-01-24 16:07:51 +00:00
parent d924dbf4ae
commit 6d53ad6b5c
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/bio/bss_acpt.c
View File

@ -526,7 +526,12 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
break; break;
case BIO_CTRL_DUP: case BIO_CTRL_DUP:
break; break;
case BIO_CTRL_EOF:
if (b->next_bio == NULL)
ret = 0;
else
ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
break;
default: default:
ret = 0; ret = 0;
break; break;

5
crypto/bio/bss_conn.c
View File

@ -313,6 +313,8 @@ static int conn_read(BIO *b, char *out, int outl)
if (ret <= 0) { if (ret <= 0) {
if (BIO_sock_should_retry(ret)) if (BIO_sock_should_retry(ret))
BIO_set_retry_read(b); BIO_set_retry_read(b);
else if (ret == 0)
b->flags |= BIO_FLAGS_IN_EOF;
} }
} }
return ret; return ret;
@ -492,6 +494,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
*fptr = data->info_callback; *fptr = data->info_callback;
} }
break; break;
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
break;
default: default:
ret = 0; ret = 0;
break; break;

5
crypto/bio/bss_fd.c
View File

@ -123,6 +123,8 @@ static int fd_read(BIO *b, char *out, int outl)
if (ret <= 0) { if (ret <= 0) {
if (BIO_fd_should_retry(ret)) if (BIO_fd_should_retry(ret))
BIO_set_retry_read(b); BIO_set_retry_read(b);
else if (ret == 0)
b->flags |= BIO_FLAGS_IN_EOF;
} }
} }
return ret; return ret;
@ -186,6 +188,9 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_FLUSH: case BIO_CTRL_FLUSH:
ret = 1; ret = 1;
break; break;
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
break;
default: default:
ret = 0; ret = 0;
break; break;