From 605026da08ae5f0877cb7dc163587f114383c10c Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Sat, 30 Jul 2022 11:46:56 +0800 Subject: [PATCH] Fix tls13_server tls13_send bug --- src/tls.c | 10 +++++----- tools/tls13_server.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tls.c b/src/tls.c index c43bde29..2f171230 100644 --- a/src/tls.c +++ b/src/tls.c @@ -1507,7 +1507,7 @@ int tls_record_send(const uint8_t *record, size_t recordlen, int sock) return -1; } if ((r = send(sock, record, recordlen, 0)) < 0) { - perror(""); + perror("tls_record_send"); error_print(); return -1; } else if (r != recordlen) { @@ -1526,12 +1526,12 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, int sock) len = 5; while (len) { if ((r = recv(sock, record + 5 - len, len, 0)) < 0) { - perror(""); + perror("tls_record_do_recv"); error_print(); return -1; } if (r == 0) { - perror(""); + perror("tls_record_do_recv"); error_print(); return 0; } @@ -1555,7 +1555,7 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, int sock) } while (len) { if ((r = recv(sock, record + *recordlen - len, len, 0)) < 0) { - perror(""); + perror("tls_record_do_recv"); error_print(); return -1; } @@ -2310,7 +2310,7 @@ int tls_set_socket(TLS_CONNECT *conn, int sock) if ((opts = fcntl(sock, F_GETFL)) < 0) { error_print(); - perror(""); + perror("tls_set_socket"); return -1; } opts &= ~O_NONBLOCK; diff --git a/tools/tls13_server.c b/tools/tls13_server.c index f2ad8637..4ad5708d 100644 --- a/tools/tls13_server.c +++ b/tools/tls13_server.c @@ -209,7 +209,7 @@ restart: } } while (!len); - if (tls13_send(&conn, (uint8_t *)buf, len, /* &sentlen*/ 0) != 1) { + if (tls13_send(&conn, (uint8_t *)buf, len, &sentlen) != 1) { fprintf(stderr, "%s: send failure, close connection\n", prog); close(conn.sock); goto end;