Commit 5d5c78b4 authored by Steve Holme's avatar Steve Holme
Browse files

vtls: Removed unimplemented overrides of curlssl_close_all() 

Carrying on from commit 037cd0d9, removed the following unimplemented
instances of curlssl_close_all():

Curl_axtls_close_all()
Curl_darwinssl_close_all()
Curl_cyassl_close_all()
Curl_gskit_close_all()
Curl_gtls_close_all()
Curl_nss_close_all()
Curl_polarssl_close_all()
parent 8bb3443a

lib/vtls/axtls.c

+1 −7
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2010, DirecTV, Contact: Eric Hu, <ehu@directv.com>.

 * Copyright (C) 2010 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2010 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -515,12 +515,6 @@ static ssize_t axtls_send(struct connectdata *conn, 
  return rc;

}



void Curl_axtls_close_all(struct SessionHandle *data)

{

  (void)data;

  infof(data, "  Curl_axtls_close_all\n");

}



void Curl_axtls_close(struct connectdata *conn, int sockindex)

{

  struct ssl_connect_data *connssl = &conn->ssl[sockindex];

lib/vtls/axtls.h

+1 −5
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ CURLcode Curl_axtls_connect_nonblocking( 
    int sockindex,

    bool *done);



/* tell axTLS to close down all open information regarding connections (and

   thus session ID caching etc) */

void Curl_axtls_close_all(struct SessionHandle *data);



 /* close a SSL connection */

void Curl_axtls_close(struct connectdata *conn, int sockindex);
@@ -59,7 +55,7 @@ int Curl_axtls_random(struct SessionHandle *data, 
#define curlssl_connect Curl_axtls_connect

#define curlssl_connect_nonblocking Curl_axtls_connect_nonblocking

#define curlssl_session_free(x)  Curl_axtls_session_free(x)

#define curlssl_close_all Curl_axtls_close_all

#define curlssl_close_all(x) ((void)x)

#define curlssl_close Curl_axtls_close

#define curlssl_shutdown(x,y) Curl_axtls_shutdown(x,y)

#define curlssl_set_engine(x,y) ((void)x, (void)y, CURLE_NOT_BUILT_IN)

lib/vtls/curl_darwinssl.c

+0 −6
Original line number Diff line number Diff line
@@ -2229,12 +2229,6 @@ void Curl_darwinssl_close(struct connectdata *conn, int sockindex) 
  connssl->ssl_sockfd = 0;

}



void Curl_darwinssl_close_all(struct SessionHandle *data)

{

  /* SecureTransport doesn't separate sessions from contexts, so... */

  (void)data;

}



int Curl_darwinssl_shutdown(struct connectdata *conn, int sockindex)

{

  struct ssl_connect_data *connssl = &conn->ssl[sockindex];

lib/vtls/curl_darwinssl.h

+1 −4
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ CURLcode Curl_darwinssl_connect_nonblocking(struct connectdata *conn, 
                                            int sockindex,

                                            bool *done);



/* this function doesn't actually do anything */

void Curl_darwinssl_close_all(struct SessionHandle *data);



/* close a SSL connection */

void Curl_darwinssl_close(struct connectdata *conn, int sockindex);
@@ -61,7 +58,7 @@ void Curl_darwinssl_md5sum(unsigned char *tmp, /* input */ 
#define curlssl_connect Curl_darwinssl_connect

#define curlssl_connect_nonblocking Curl_darwinssl_connect_nonblocking

#define curlssl_session_free(x) Curl_darwinssl_session_free(x)

#define curlssl_close_all Curl_darwinssl_close_all

#define curlssl_close_all(x) ((void)x)

#define curlssl_close Curl_darwinssl_close

#define curlssl_shutdown(x,y) 0

#define curlssl_set_engine(x,y) ((void)x, (void)y, CURLE_NOT_BUILT_IN)

lib/vtls/cyassl.c

+1 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -393,11 +393,6 @@ static ssize_t cyassl_send(struct connectdata *conn, 
  return rc;

}



void Curl_cyassl_close_all(struct SessionHandle *data)

{

  (void)data;

}



void Curl_cyassl_close(struct connectdata *conn, int sockindex)

{

  struct ssl_connect_data *conssl = &conn->ssl[sockindex];