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

Update tls.c

Browse Source
This commit is contained in:
Zhi Guan
2026-06-13 07:38:55 +08:00
parent 99fabca0cb
commit d8a9f446b3
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -768,7 +768,7 @@ endif()
# #
set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team") set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1016") set(CPACK_PACKAGE_VERSION "3.2.0-dev.1017")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack) include(CPack)

2
include/gmssl/version.h
View File

@@ -19,7 +19,7 @@ extern "C" {
// Also update CPACK_PACKAGE_VERSION in CMakeLists.txt // Also update CPACK_PACKAGE_VERSION in CMakeLists.txt
#define GMSSL_VERSION_NUM 30200 #define GMSSL_VERSION_NUM 30200
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1016" #define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1017"
int gmssl_version_num(void); int gmssl_version_num(void);
const char *gmssl_version_str(void); const char *gmssl_version_str(void);

14
src/tls.c
View File

@@ -3143,25 +3143,13 @@ int tls_set_verbose(TLS_CONNECT *conn, int verbose)
int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock) int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock)
{ {
#ifdef WIN32 #ifndef WIN32
u_long flags = 0; // TODO: 0 == blocking, 1 == non-blocking
if(ioctlsocket(sock, FIONBIO, &flags) != 0) {
error_puts("socket in non-blocking mode");
//nginx will pass a socket in non-blocking mode
//return -1; // FIXME
}
#else
int flags = 0; int flags = 0;
if ((flags = fcntl(sock, F_GETFL)) == -1) { if ((flags = fcntl(sock, F_GETFL)) == -1) {
error_print(); error_print();
perror("fcntl error"); perror("fcntl error");
return -1; return -1;
} }
if (flags & O_NONBLOCK) {
error_puts("socket in non-blocking mode");
//nginx will pass a socket in non-blocking mode
//return -1; // FIXME
}
#endif #endif
conn->sock = sock; conn->sock = sock;
return 1; return 1;