Commit 6cb7b0c0 authored by Steve Holme's avatar Steve Holme
Browse files

vtls: Use bool for Curl_ssl_getsessionid() return type 

The return type of this function is a boolean value, and even uses a
bool internally, so use bool in the function declaration as well as
the variables that store the return value, to avoid any confusion.
parent 38aaf6c3

lib/vtls/curl_schannel.c

+2 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) 
  struct SessionHandle *data = conn->data;

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

  struct curl_schannel_cred *old_cred = NULL;

  int incache;

  bool incache;



  DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);
@@ -550,6 +550,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) 
      incache = FALSE;

    }

  }



  if(!incache) {

    result = Curl_ssl_addsessionid(conn, (void *)connssl->cred,

                                   sizeof(struct curl_schannel_cred));

lib/vtls/cyassl.c

+2 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ cyassl_connect_step3(struct connectdata *conn, 
  void *old_ssl_sessionid=NULL;

  struct SessionHandle *data = conn->data;

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

  int incache;

  bool incache;

  SSL_SESSION *our_ssl_sessionid;



  DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);
@@ -347,6 +347,7 @@ cyassl_connect_step3(struct connectdata *conn, 
      incache = FALSE;

    }

  }



  if(!incache) {

    result = Curl_ssl_addsessionid(conn, our_ssl_sessionid,

                                   0 /* unknown size */);

lib/vtls/gtls.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ gtls_connect_step3(struct connectdata *conn, 
  struct SessionHandle *data = conn->data;

  gnutls_session_t session = conn->ssl[sockindex].session;

  int rc;

  int incache;

  bool incache;

  void *ssl_sessionid;

#ifdef HAS_ALPN

  gnutls_datum_t proto;

lib/vtls/openssl.c

+2 −2
Original line number Diff line number Diff line
@@ -2610,7 +2610,7 @@ static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex) 
  void *old_ssl_sessionid = NULL;

  struct SessionHandle *data = conn->data;

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

  int incache;

  bool incache;

  SSL_SESSION *our_ssl_sessionid;



  DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);

lib/vtls/polarssl.c

+2 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ polarssl_connect_step3(struct connectdata *conn, 
  struct SessionHandle *data = conn->data;

  void *old_ssl_sessionid = NULL;

  ssl_session *our_ssl_sessionid = &conn->ssl[sockindex].ssn ;

  int incache;

  bool incache;



  DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);
@@ -501,6 +501,7 @@ polarssl_connect_step3(struct connectdata *conn, 
      incache = FALSE;

    }

  }



  if(!incache) {

    void *new_session = malloc(sizeof(ssl_session));