Update tls.c

This commit is contained in:
zhaoxiaomeng
2022-11-29 17:18:01 +08:00
parent 90a806a46b
commit 602d3c8fa6

View File

@@ -1492,7 +1492,6 @@ 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) {
fprintf(stderr, "%s:%d:%s):\n", __FILE__, __LINE__, __func__);
retry: retry:
if (tls_record_do_recv(record, recordlen, sock) != 1) { if (tls_record_do_recv(record, recordlen, sock) != 1) {
error_print(); error_print();
@@ -2254,41 +2253,32 @@ int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock) {
} }
int tls_do_handshake(TLS_CONNECT *conn) { int tls_do_handshake(TLS_CONNECT *conn) {
fprintf(stderr, "%s:%d:%s --------- %d:\n", __FILE__, __LINE__, __func__,
conn->protocol); conn->protocol);
switch (conn->protocol) { switch (conn->protocol) {
case TLS_protocol_tlcp: case TLS_protocol_tlcp:
fprintf(stderr, "%s:%d:%s(TLS_protocol_tlcp):\n", __FILE__, if (conn->is_client)
__LINE__, __func__); return tlcp_do_connect(conn);
if (conn->is_client) else
return tlcp_do_connect(conn); return tlcp_do_accept(conn);
else case TLS_protocol_tls12:
return tlcp_do_accept(conn); if (conn->is_client)
case TLS_protocol_tls12: return tls12_do_connect(conn);
fprintf(stderr, "%s:%d:%s(TLS_protocol_tls12):\n", __FILE__, else
__LINE__, __func__); return tls12_do_accept(conn);
if (conn->is_client) case TLS_protocol_tls13:
return tls12_do_connect(conn); if (conn->is_client) {
else return tls13_do_connect(conn);
return tls12_do_accept(conn); } else {
case TLS_protocol_tls13: return tls13_do_accept(conn);
if (conn->is_client) { }
fprintf(stderr, "%s:%d:%s(client):\n", __FILE__, __LINE__,
__func__);
return tls13_do_connect(conn);
} else {
fprintf(stderr, "%s:%d:%s(server):\n", __FILE__, __LINE__,
__func__);
return tls13_do_accept(conn);
} }
}
fprintf(stderr, "%s:%d:%s(error):\n", __FILE__, __LINE__, __func__); fprintf(stderr, "%s:%d:%s(error):\n", __FILE__, __LINE__, __func__);
error_print(); error_print();
return -1; return -1;
} }
int tls_get_verify_result(TLS_CONNECT *conn, int *result) { int tls_get_verify_result(TLS_CONNECT *conn, int *result) {
*result = conn->verify_result; *result = conn->verify_result;
return 1; return 1;
} }