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

Update TLS/TLCP shutdown

Browse Source
This commit is contained in:
Zhi Guan
2026-06-12 14:09:42 +08:00
parent 51883c507a
commit 8b586d4299
10 changed files with 570 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
tools/tlcp_client.c
View File

@@ -101,6 +101,67 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
static int do_send_select(TLS_CONNECT *conn, const uint8_t *buf, size_t len)
{
int ret;
size_t offset = 0;
fd_set rfds;
fd_set wfds;
while (offset < len) {
size_t sentlen = 0;
ret = tls_send(conn, buf + offset, len - offset, &sentlen);
if (ret == 1) {
offset += sentlen;
continue;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
return 1;
}
int tlcp_client_main(int argc, char *argv[])
{
int ret = -1;
@@ -396,7 +457,7 @@ bad:
snprintf(buf, sizeof(buf), "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n", get, host);
if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) {
if (do_send_select(&conn, (uint8_t *)buf, strlen(buf)) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}
@@ -419,6 +480,8 @@ bad:
fflush(stdout);
} else if (rv == 0) {
fprintf(stderr, "%s: TLCP connection is closed by remote host\n", prog);
do_shutdown_select(&conn);
ret = 0;
goto end;
} else if (rv == -EAGAIN
|| rv == TLS_ERROR_RECV_AGAIN
@@ -436,7 +499,7 @@ bad:
fprintf(stderr, "%s: select error\n", prog);
goto end;
} else if (sel == 0) {
tls_shutdown(&conn);
do_shutdown_select(&conn);
ret = 0;
goto end;
}
@@ -458,7 +521,7 @@ bad:
if (read_stdin) {
#ifdef WIN32
if (fgets(buf, sizeof(buf), stdin)) {
if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) {
if (do_send_select(&conn, (uint8_t *)buf, strlen(buf)) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}
@@ -467,7 +530,9 @@ bad:
fprintf(stderr, "%s: length of input line exceeds buffer size\n", prog);
goto end;
}
read_stdin = 0;
do_shutdown_select(&conn);
ret = 0;
goto end;
}
#else
FD_SET(STDIN_FILENO, &fds); // in POSIX, first arg type is int
@@ -483,7 +548,7 @@ bad:
if (read_stdin && FD_ISSET(STDIN_FILENO, &fds)) {
if (fgets(buf, sizeof(buf), stdin)) {
if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) {
if (do_send_select(&conn, (uint8_t *)buf, strlen(buf)) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}
@@ -492,7 +557,9 @@ bad:
fprintf(stderr, "%s: length of input line exceeds buffer size\n", prog);
goto end;
}
read_stdin = 0;
do_shutdown_select(&conn);
ret = 0;
goto end;
}
}
#endif
@@ -508,6 +575,8 @@ bad:
fflush(stdout);
} else if (rv == 0) {
fprintf(stderr, "Connection closed by remote host\n");
do_shutdown_select(&conn);
ret = 0;
goto end;
} else if (rv == -EAGAIN
|| rv == TLS_ERROR_RECV_AGAIN

74
tools/tlcp_server.c
View File

@@ -81,6 +81,67 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
static int do_send_select(TLS_CONNECT *conn, const uint8_t *buf, size_t len)
{
int ret;
size_t offset = 0;
fd_set rfds;
fd_set wfds;
while (offset < len) {
size_t sentlen = 0;
ret = tls_send(conn, buf + offset, len - offset, &sentlen);
if (ret == 1) {
offset += sentlen;
continue;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
return 1;
}
int tlcp_server_main(int argc , char **argv)
{
int ret = 1;
@@ -267,7 +328,6 @@ restart:
for (;;) {
int rv;
size_t sentlen;
fd_set fds;
do {
@@ -286,8 +346,14 @@ restart:
|| rv == TLS_ERROR_SEND_AGAIN) {
continue;
}
if (rv < 0) fprintf(stderr, "%s: recv failure\n", prog);
else fprintf(stderr, "%s: Disconnected by remote\n", prog);
if (rv < 0) {
fprintf(stderr, "%s: recv failure\n", prog);
} else {
if (do_shutdown_select(&conn) != 1) {
fprintf(stderr, "%s: shutdown failure\n", prog);
}
fprintf(stderr, "%s: Disconnected by remote\n", prog);
}
//tls_socket_close(conn.sock); // FIXME:
tls_cleanup(&conn);
@@ -295,7 +361,7 @@ restart:
}
} while (!len);
if (tls_send(&conn, (uint8_t *)buf, len, &sentlen) != 1) {
if (do_send_select(&conn, (uint8_t *)buf, len) != 1) {
fprintf(stderr, "%s: send failure, close connection\n", prog);
tls_socket_close(conn.sock);
goto end;

74
tools/tls12_client.c
View File

@@ -96,6 +96,67 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
static int do_send_select(TLS_CONNECT *conn, const uint8_t *buf, size_t len)
{
int ret;
size_t offset = 0;
fd_set rfds;
fd_set wfds;
while (offset < len) {
size_t sentlen = 0;
ret = tls_send(conn, buf + offset, len - offset, &sentlen);
if (ret == 1) {
offset += sentlen;
continue;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
return 1;
}
int tls12_client_main(int argc, char *argv[])
{
int ret = -1;
@@ -357,17 +418,15 @@ bad:
for (;;) {
fd_set fds;
size_t sentlen;
if (!fgets(send_buf, sizeof(send_buf), stdin)) {
if (feof(stdin)) {
tls_shutdown(&conn);
do_shutdown_select(&conn);
goto end;
} else {
continue;
}
}
if (tls_send(&conn, (uint8_t *)send_buf, strlen(send_buf), &sentlen) != 1) {
if (do_send_select(&conn, (uint8_t *)send_buf, strlen(send_buf)) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}
@@ -396,6 +455,9 @@ bad:
|| rv == TLS_ERROR_SEND_AGAIN) {
break;
}
if (rv == 0) {
do_shutdown_select(&conn);
}
goto end;
}
fwrite(buf, 1, len, stdout);
@@ -415,13 +477,13 @@ bad:
if (!fgets(send_buf, sizeof(send_buf), stdin)) {
if (feof(stdin)) {
tls_shutdown(&conn);
do_shutdown_select(&conn);
goto end;
} else {
continue;
}
}
if (tls_send(&conn, (uint8_t *)send_buf, strlen(send_buf), &sentlen) != 1) {
if (do_send_select(&conn, (uint8_t *)send_buf, strlen(send_buf)) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}

74
tools/tls12_server.c
View File

@@ -87,6 +87,67 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
static int do_send_select(TLS_CONNECT *conn, const uint8_t *buf, size_t len)
{
int ret;
size_t offset = 0;
fd_set rfds;
fd_set wfds;
while (offset < len) {
size_t sentlen = 0;
ret = tls_send(conn, buf + offset, len - offset, &sentlen);
if (ret == 1) {
offset += sentlen;
continue;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
return 1;
}
int tls12_server_main(int argc , char **argv)
{
int ret = 1;
@@ -362,7 +423,6 @@ restart:
for (;;) {
int rv;
size_t sentlen;
fd_set fds;
do {
@@ -381,8 +441,14 @@ restart:
|| rv == TLS_ERROR_SEND_AGAIN) {
continue;
}
if (rv < 0) fprintf(stderr, "%s: recv failure\n", prog);
else fprintf(stderr, "%s: Disconnected by remote\n", prog);
if (rv < 0) {
fprintf(stderr, "%s: recv failure\n", prog);
} else {
if (do_shutdown_select(&conn) != 1) {
fprintf(stderr, "%s: shutdown failure\n", prog);
}
fprintf(stderr, "%s: Disconnected by remote\n", prog);
}
//tls_socket_close(conn.sock); // FIXME:
tls_cleanup(&conn);
@@ -390,7 +456,7 @@ restart:
}
} while (!len);
if (tls_send(&conn, (uint8_t *)buf, len, &sentlen) != 1) {
if (do_send_select(&conn, (uint8_t *)buf, len) != 1) {
fprintf(stderr, "%s: send failure, close connection\n", prog);
tls_socket_close(conn.sock);
goto end;

36
tools/tls13_client.c
View File

@@ -70,6 +70,34 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
static const char *http_get =
"GET / HTTP/1.1\r\n"
"Hostname: aaa\r\n"
@@ -725,6 +753,10 @@ bad:
if ((ret = tls_recv(&conn, (uint8_t *)buf, sizeof(buf), &len)) != 1) {
if (ret == TLS_ERROR_SEND_AGAIN || ret == TLS_ERROR_RECV_AGAIN) {
continue;
} else if (ret == 0) {
do_shutdown_select(&conn);
ret = 0;
goto end;
} else {
error_print();
goto end;
@@ -742,9 +774,9 @@ bad:
if (!fgets(send_buf, sizeof(send_buf), stdin)) {
if (feof(stdin)) {
error_print();
fprintf(stderr, "client shutdown\n");
tls_shutdown(&conn);
do_shutdown_select(&conn);
ret = 0;
goto end;
} else {
continue;

31
tools/tls13_server.c
View File

@@ -99,6 +99,34 @@ static int do_handshake_select(TLS_CONNECT *conn)
}
}
static int do_shutdown_select(TLS_CONNECT *conn)
{
int ret;
fd_set rfds;
fd_set wfds;
for (;;) {
ret = tls_shutdown(conn);
if (ret == 1) {
return 1;
}
FD_ZERO(&rfds);
FD_ZERO(&wfds);
if (ret == TLS_ERROR_RECV_AGAIN) {
FD_SET(conn->sock, &rfds);
} else if (ret == TLS_ERROR_SEND_AGAIN) {
FD_SET(conn->sock, &wfds);
} else {
error_print();
return -1;
}
if (select((int)(conn->sock + 1), &rfds, &wfds, NULL, NULL) < 0) {
error_print();
return -1;
}
}
}
int tls13_server_main(int argc , char **argv)
{
@@ -630,6 +658,9 @@ bad:
if ((ret = tls_recv(&conn, (uint8_t *)buf, sizeof(buf), &len)) != 1) {
if (ret == TLS_ERROR_SEND_AGAIN || ret == TLS_ERROR_RECV_AGAIN) {
continue;
} else if (ret == 0) {
do_shutdown_select(&conn);
goto end;
}
error_print();
goto end;