moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

vtls: rename some of the SSL functions

Browse Source 
... in the SSL structure as AmiSSL is using macros for the socket API
functions.
This commit is contained in:
Chris Young 2019-03-12 22:50:28 +00:00 committed by Daniel Stenberg
parent fe802fd6a6
commit 76a9d8df0e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vtls/vtls.c
View File

@ -248,7 +248,7 @@ Curl_ssl_connect(struct connectdata *conn, int sockindex)
conn->ssl[sockindex].use = TRUE; conn->ssl[sockindex].use = TRUE;
conn->ssl[sockindex].state = ssl_connection_negotiating; conn->ssl[sockindex].state = ssl_connection_negotiating;
result = Curl_ssl->connect(conn, sockindex); result = Curl_ssl->connect_blocking(conn, sockindex);
if(!result) if(!result)
Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */ Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */
@ -557,7 +557,7 @@ void Curl_ssl_close(struct connectdata *conn, int sockindex)
CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex) CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)
{ {
if(Curl_ssl->shutdown(conn, sockindex)) if(Curl_ssl->shut_down(conn, sockindex))
return CURLE_SSL_SHUTDOWN_FAILED; return CURLE_SSL_SHUTDOWN_FAILED;
conn->ssl[sockindex].use = FALSE; /* get back to ordinary socket usage */ conn->ssl[sockindex].use = FALSE; /* get back to ordinary socket usage */
@ -1114,7 +1114,7 @@ static CURLcode Curl_multissl_connect(struct connectdata *conn, int sockindex)
{ {
if(multissl_init(NULL)) if(multissl_init(NULL))
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
return Curl_ssl->connect(conn, sockindex); return Curl_ssl->connect_blocking(conn, sockindex);
} }
static CURLcode Curl_multissl_connect_nonblocking(struct connectdata *conn, static CURLcode Curl_multissl_connect_nonblocking(struct connectdata *conn,

4
lib/vtls/vtls.h
View File

@ -47,7 +47,7 @@ struct Curl_ssl {
size_t (*version)(char *buffer, size_t size); size_t (*version)(char *buffer, size_t size);
int (*check_cxn)(struct connectdata *cxn); int (*check_cxn)(struct connectdata *cxn);
int (*shutdown)(struct connectdata *conn, int sockindex); int (*shut_down)(struct connectdata *conn, int sockindex);
bool (*data_pending)(const struct connectdata *conn, bool (*data_pending)(const struct connectdata *conn,
int connindex); int connindex);
@ -56,7 +56,7 @@ struct Curl_ssl {
size_t length); size_t length);
bool (*cert_status_request)(void); bool (*cert_status_request)(void);
CURLcode (*connect)(struct connectdata *conn, int sockindex); CURLcode (*connect_blocking)(struct connectdata *conn, int sockindex);
CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex, CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex,
bool *done); bool *done);
void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info); void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info);