curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-18 01:52:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

libssh2: don't typecast socket to int for libssh2_session_handshake

Browse Source 
Since libssh2_socket_t uses SOCKET on windows which can be larger than
int.

Closes #8492
This commit is contained in:
Daniel Stenberg 2022-02-21 14:55:31 +01:00
parent 441db4652c
commit 999c2179a1
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vssh/libssh2.c
View File

@ -433,7 +433,9 @@ static int sshkeycallback(struct Curl_easy *easy,
* libssh2 1.2.8 fixed the problem with 32bit ints used for sockets on win64. * libssh2 1.2.8 fixed the problem with 32bit ints used for sockets on win64.
*/ */
#ifdef HAVE_LIBSSH2_SESSION_HANDSHAKE #ifdef HAVE_LIBSSH2_SESSION_HANDSHAKE
#define libssh2_session_startup(x,y) libssh2_session_handshake(x,y) #define session_startup(x,y) libssh2_session_handshake(x, y)
#else
#define session_startup(x,y) libssh2_session_startup(x, (int)y)
#endif #endif
static CURLcode ssh_knownhost(struct Curl_easy *data) static CURLcode ssh_knownhost(struct Curl_easy *data)
@ -932,7 +934,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
/* FALLTHROUGH */ /* FALLTHROUGH */
case SSH_S_STARTUP: case SSH_S_STARTUP:
rc = libssh2_session_startup(sshc->ssh_session, (int)sock); rc = session_startup(sshc->ssh_session, sock);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
} }