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

Add socket wrapper

Browse Source
This commit is contained in:
Zhi Guan
2022-11-01 17:57:31 +08:00
parent 87081c4ca4
commit bae6721afa
13 changed files with 105 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tlcp.c
View File

@@ -14,15 +14,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <unistd.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <gmssl/rand.h>
#include <gmssl/x509.h>
#include <gmssl/error.h>

66
src/tls.c
View File

@@ -14,19 +14,6 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <gmssl/rand.h>
#include <gmssl/x509.h>
#include <gmssl/error.h>
@@ -1460,17 +1447,10 @@ int tls_cipher_suite_in_list(int cipher, const int *list, size_t list_count)
return 0;
}
#ifdef WIN32
int tls_record_send(const uint8_t *record, size_t recordlen, SOCKET sock)
#else
int tls_record_send(const uint8_t *record, size_t recordlen, int sock)
#endif
int tls_record_send(const uint8_t *record, size_t recordlen, tls_socket_t sock)
{
#ifdef WIN32
int r;
#else
ssize_t r;
#endif
tls_ret_t r;
if (!record) {
error_print();
return -1;
@@ -1483,11 +1463,7 @@ int tls_record_send(const uint8_t *record, size_t recordlen, int sock)
error_print();
return -1;
}
#ifdef WIN32
if ((r = send(sock, record, (int)recordlen, 0)) < 0) {
#else
if ((r = send(sock, record, recordlen, 0)) < 0) {
#endif
if ((r = tls_socket_send(sock, record, recordlen, 0)) < 0) {
perror("tls_record_send");
error_print();
return -1;
@@ -1498,26 +1474,14 @@ int tls_record_send(const uint8_t *record, size_t recordlen, int sock)
return 1;
}
#ifdef WIN32
int tls_record_do_recv(uint8_t *record, size_t *recordlen, SOCKET sock)
#else
int tls_record_do_recv(uint8_t *record, size_t *recordlen, int sock)
#endif
int tls_record_do_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock)
{
#ifdef WIN32
int r;
#else
ssize_t r;
#endif
tls_ret_t r;
size_t len;
len = 5;
while (len) {
#ifdef WIN32
if ((r = recv(sock, record + 5 - len, (int)len, 0)) < 0) {
#else
if ((r = recv(sock, record + 5 - len, len, 0)) < 0) {
#endif
if ((r = tls_socket_recv(sock, record + 5 - len, len, 0)) < 0) {
perror("tls_record_do_recv");
error_print();
return -1;
@@ -1546,11 +1510,7 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, int sock)
return -1;
}
while (len) {
#ifdef WIN32
if ((r = recv(sock, record + *recordlen - len, (int)len, 0)) < 0) {
#else
if ((r = recv(sock, record + *recordlen - len, len, 0)) < 0) {
#endif
perror("tls_record_do_recv");
error_print();
return -1;
@@ -1560,11 +1520,7 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, int sock)
return 1;
}
#ifdef WIN32
int tls_record_recv(uint8_t *record, size_t *recordlen, SOCKET sock)
#else
int tls_record_recv(uint8_t *record, size_t *recordlen, int sock)
#endif
int tls_record_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock)
{
retry:
if (tls_record_do_recv(record, recordlen, sock) != 1) {
@@ -2303,11 +2259,7 @@ void tls_cleanup(TLS_CONNECT *conn)
gmssl_secure_clear(conn, sizeof(TLS_CONNECT));
}
#ifdef WIN32
int tls_set_socket(TLS_CONNECT *conn, SOCKET sock)
#else
int tls_set_socket(TLS_CONNECT *conn, int sock)
#endif
int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock)
{
#if 0
int opts;

10
src/tls12.c
View File

@@ -13,16 +13,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <gmssl/rand.h>
#include <gmssl/x509.h>
#include <gmssl/error.h>

9
src/tls13.c
View File

@@ -13,15 +13,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <unistd.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <gmssl/rand.h>
#include <gmssl/x509.h>
#include <gmssl/error.h>

12
src/tls_ext.c
View File

@@ -14,18 +14,6 @@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <unistd.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <gmssl/rand.h>
#include <gmssl/x509.h>
#include <gmssl/error.h>