Unverified Commit 3ea5461d authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Daniel Stenberg
Browse files

axtls: reorder functions topologically 



The connect_finish() function (like many other functions after it) calls
the Curl_axtls_close() function; While this is not a problem now
(because axtls.h declares the latter function), a patch looming in the
immediate future with make all of these functions file-local.

So let's just move the Curl_axtls_close() function's definition before
it is called.

Signed-off-by: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent f0b4db1a

lib/vtls/axtls.c

+16 −16
Original line number Diff line number Diff line
@@ -284,6 +284,22 @@ static CURLcode connect_prep(struct connectdata *conn, int sockindex) 
  return CURLE_OK;

}



void Curl_axtls_close(struct connectdata *conn, int sockindex)

{

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



  infof(conn->data, "  Curl_axtls_close\n");



    /* line from openssl.c: (void)SSL_shutdown(connssl->ssl);

       axTLS compat layer does nothing for SSL_shutdown */



    /* The following line is from openssl.c.  There seems to be no axTLS

       equivalent.  ssl_free and ssl_ctx_free close things.

       SSL_set_connect_state(connssl->handle); */



  free_ssl_structs(connssl);

}



/*

 * For both blocking and non-blocking connects, this function finalizes the

 * SSL connection.
@@ -543,22 +559,6 @@ static ssize_t axtls_send(struct connectdata *conn, 
  return rc;

}



void Curl_axtls_close(struct connectdata *conn, int sockindex)

{

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



  infof(conn->data, "  Curl_axtls_close\n");



    /* line from openssl.c: (void)SSL_shutdown(connssl->ssl);

       axTLS compat layer does nothing for SSL_shutdown */



    /* The following line is from openssl.c.  There seems to be no axTLS

       equivalent.  ssl_free and ssl_ctx_free close things.

       SSL_set_connect_state(connssl->handle); */



  free_ssl_structs(connssl);

}



/*

 * This function is called to shut down the SSL layer but keep the

 * socket open (CCC - Clear Command Channel)