ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Use secure variable instead of ssl_s handle in a few more places.

This commit is contained in:
Jacek Caban 2013-03-04 17:48:59 +01:00 committed by Alexandre Julliard
parent b039192d3b
commit 125583c4d9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wininet/netconnection.c
View File

@ -702,12 +702,12 @@ void free_netconn(netconn_t *netconn)
{ {
server_release(netconn->server); server_release(netconn->server);
if (netconn->secure) {
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
if (netconn->ssl_s) {
pSSL_shutdown(netconn->ssl_s); pSSL_shutdown(netconn->ssl_s);
pSSL_free(netconn->ssl_s); pSSL_free(netconn->ssl_s);
}
#endif #endif
}
closesocket(netconn->socket); closesocket(netconn->socket);
heap_free(netconn); heap_free(netconn);
@ -936,7 +936,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags,
else else
{ {
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
if(!connection->ssl_s) { if(!connection->secure) {
FIXME("not connected\n"); FIXME("not connected\n");
return ERROR_NOT_SUPPORTED; return ERROR_NOT_SUPPORTED;
} }
@ -972,7 +972,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *
else else
{ {
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
if(!connection->ssl_s) { if(!connection->secure) {
FIXME("not connected\n"); FIXME("not connected\n");
return ERROR_NOT_SUPPORTED; return ERROR_NOT_SUPPORTED;
} }
@ -1015,7 +1015,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available)
else else
{ {
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
*available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; *available = pSSL_pending(connection->ssl_s);
#else #else
FIXME("not supported on this platform\n"); FIXME("not supported on this platform\n");
return FALSE; return FALSE;
@ -1060,7 +1060,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection)
X509* cert; X509* cert;
LPCVOID r = NULL; LPCVOID r = NULL;
if (!connection->ssl_s) if (!connection->secure)
return NULL; return NULL;
cert = pSSL_get_peer_certificate(connection->ssl_s); cert = pSSL_get_peer_certificate(connection->ssl_s);
@ -1082,7 +1082,7 @@ int NETCON_GetCipherStrength(netconn_t *connection)
#endif #endif
int bits = 0; int bits = 0;
if (!connection->ssl_s) if (!connection->secure)
return 0; return 0;
cipher = pSSL_get_current_cipher(connection->ssl_s); cipher = pSSL_get_current_cipher(connection->ssl_s);
if (!cipher) if (!cipher)