Unverified Commit 76a9d8df authored by Chris Young's avatar Chris Young Committed by Daniel Stenberg
Browse files

vtls: rename some of the SSL functions 

... in the SSL structure as AmiSSL is using macros for the socket API
functions.
parent fe802fd6

lib/vtls/vtls.c

+3 −3
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ Curl_ssl_connect(struct connectdata *conn, int sockindex) 
  conn->ssl[sockindex].use = TRUE;

  conn->ssl[sockindex].state = ssl_connection_negotiating;



  result = Curl_ssl->connect(conn, sockindex);

  result = Curl_ssl->connect_blocking(conn, sockindex);



  if(!result)

    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)

{

  if(Curl_ssl->shutdown(conn, sockindex))

  if(Curl_ssl->shut_down(conn, sockindex))

    return CURLE_SSL_SHUTDOWN_FAILED;



  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))

    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,

lib/vtls/vtls.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct Curl_ssl { 


  size_t (*version)(char *buffer, size_t size);

  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,

                       int connindex);
@@ -56,7 +56,7 @@ struct Curl_ssl { 
                     size_t length);

  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,

                                  bool *done);

  void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info);