abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-09-24 22:33:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update tls.c

Browse Source
This commit is contained in:
Zhi Guan
2024-02-02 11:10:50 +08:00
parent 68447f036f
commit a5c54cca38
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tls.c
View File

@@ -1508,6 +1508,9 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock)
return 0; return 0;
} else { } else {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
if (len == 5) {
return -EAGAIN;
}
tls_socket_wait(); tls_socket_wait();
} else { } else {
perror("recv"); perror("recv");
@@ -1557,9 +1560,11 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock)
int tls_record_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock) int tls_record_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock)
{ {
if (tls_record_do_recv(record, recordlen, sock) != 1) { int ret;
error_print();
return -1; if ((ret = tls_record_do_recv(record, recordlen, sock)) != 1) {
if (ret && ret != -EAGAIN) error_print();
return ret;
} }
if (tls_record_type(record) == TLS_record_alert) { if (tls_record_type(record) == TLS_record_alert) {
@@ -1769,7 +1774,7 @@ int tls_do_recv(TLS_CONNECT *conn)
tls_trace("recv ApplicationData\n"); tls_trace("recv ApplicationData\n");
if ((ret = tls_record_recv(record, &recordlen, conn->sock)) != 1) { if ((ret = tls_record_recv(record, &recordlen, conn->sock)) != 1) {
if (ret < 0) error_print(); if (ret < 0 && ret != -EAGAIN) error_print();
return ret; return ret;
} }
@@ -1798,7 +1803,7 @@ int tls_recv(TLS_CONNECT *conn, uint8_t *out, size_t outlen, size_t *recvlen)
if (conn->datalen == 0) { if (conn->datalen == 0) {
int ret; int ret;
if ((ret = tls_do_recv(conn)) != 1) { if ((ret = tls_do_recv(conn)) != 1) {
if (ret) error_print(); if (ret < 0 && ret != -EAGAIN) error_print();
return ret; return ret;
} }
} }