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

Fix Visual Studio related bugs

Browse Source
This commit is contained in:
Zhi Guan
2022-10-09 12:55:32 +08:00
parent dc58a88588
commit 6faeb627ed
16 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tlcp_client.c
View File

@@ -49,7 +49,11 @@ int tlcp_client_main(int argc, char *argv[])
char *pass = NULL;
struct hostent *hp;
struct sockaddr_in server;
#ifdef WIN32
SOCKET sock;
#else
int sock;
#endif
TLS_CTX ctx;
TLS_CONNECT conn;
char buf[1024] = {0};
@@ -202,7 +206,11 @@ bad:
end:
#ifdef WIN32
closesocket(sock);
#else
close(sock);
#endif
tls_ctx_cleanup(&ctx);
tls_cleanup(&conn);
return 0;

8
tools/tlcp_server.c
View File

@@ -48,7 +48,13 @@ int tlcp_server_main(int argc , char **argv)
char buf[1600] = {0};
size_t len = sizeof(buf);
#ifdef WIN32
SOCKET sock;
SOCKET conn_sock;
#else
int sock;
int conn_sock;
#endif
struct sockaddr_in server_addr;
struct sockaddr_in client_addr;
#ifdef WIN32
@@ -56,7 +62,7 @@ int tlcp_server_main(int argc , char **argv)
#else
socklen_t client_addrlen;
#endif
int conn_sock;
argc--;

4
tools/tls12_client.c
View File

@@ -52,7 +52,11 @@ int tls12_client_main(int argc, char *argv[])
char *pass = NULL;
struct hostent *hp;
struct sockaddr_in server;
#ifdef WIN32
SOCKET sock;
#else
int sock;
#endif
TLS_CTX ctx;
TLS_CONNECT conn;
char buf[1024] = {0};

13
tools/tls12_server.c
View File

@@ -47,7 +47,14 @@ int tls12_server_main(int argc , char **argv)
char buf[1600] = {0};
size_t len = sizeof(buf);
#ifdef WIN32
SOCKET sock;
SOCKET conn_sock;
#else
int sock;
int conn_sock;
#endif
struct sockaddr_in server_addr;
struct sockaddr_in client_addr;
#ifdef WIN32
@@ -55,7 +62,7 @@ int tls12_server_main(int argc , char **argv)
#else
socklen_t client_addrlen;
#endif
int conn_sock;
argc--;
@@ -181,7 +188,11 @@ restart:
if (tls_send(&conn, (uint8_t *)buf, len, &sentlen) != 1) {
fprintf(stderr, "%s: send failure, close connection\n", prog);
#ifdef WIN32
closesocket(conn.sock);
#else
close(conn.sock);
#endif
goto end;
}
}

8
tools/tls13_client.c
View File

@@ -49,7 +49,11 @@ int tls13_client_main(int argc, char *argv[])
char *pass = NULL;
struct hostent *hp;
struct sockaddr_in server;
#ifdef WIN32
SOCKET sock;
#else
int sock;
#endif
TLS_CTX ctx;
TLS_CONNECT conn;
char buf[1024] = {0};
@@ -194,7 +198,11 @@ bad:
}
end:
#ifdef WIN32
closesocket(sock);
#else
close(sock);
#endif
tls_ctx_cleanup(&ctx);
tls_cleanup(&conn);
return 0;

12
tools/tls13_server.c
View File

@@ -47,7 +47,13 @@ int tls13_server_main(int argc , char **argv)
char buf[1600] = {0};
size_t len = sizeof(buf);
#ifdef WIN32
SOCKET sock;
SOCKET conn_sock;
#else
int sock;
int conn_sock;
#endif
struct sockaddr_in server_addr;
struct sockaddr_in client_addr;
#ifdef WIN32
@@ -55,7 +61,7 @@ int tls13_server_main(int argc , char **argv)
#else
socklen_t client_addrlen;
#endif
int conn_sock;
argc--;
@@ -181,7 +187,11 @@ restart:
if (tls13_send(&conn, (uint8_t *)buf, len, &sentlen) != 1) {
fprintf(stderr, "%s: send failure, close connection\n", prog);
#ifdef WIN32
closesocket(conn.sock);
#else
close(conn.sock);
#endif
goto end;
}
}