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

vtls: declare Curl_ssl structs for every SSL backend 



The idea of introducing the Curl_ssl struct was to unify how the SSL
backends are declared and called. To this end, we now provide an
instance of the Curl_ssl struct for each and every SSL backend.

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

lib/vtls/axtls.c

+22 −0
Original line number Diff line number Diff line
@@ -702,4 +702,26 @@ CURLcode Curl_axtls_random(struct Curl_easy *data, 
  return CURLE_OK;

}



const struct Curl_ssl Curl_ssl_axtls = {

  "axtls",                        /* name */



  Curl_axtls_init,                /* init */

  Curl_axtls_cleanup,             /* cleanup */

  Curl_axtls_version,             /* version */

  Curl_axtls_check_cxn,           /* check_cxn */

  Curl_axtls_shutdown,            /* shutdown */

  Curl_none_data_pending,         /* data_pending */

  Curl_axtls_random,              /* random */

  Curl_none_cert_status_request,  /* cert_status_request */

  Curl_axtls_connect,             /* connect */

  Curl_axtls_connect_nonblocking, /* connect_nonblocking */

  Curl_axtls_close,               /* close */

  Curl_none_close_all,            /* close_all */

  Curl_axtls_session_free,        /* session_free */

  Curl_none_set_engine,           /* set_engine */

  Curl_none_set_engine_default,   /* set_engine_default */

  Curl_none_engines_list,         /* engines_list */

  Curl_none_false_start           /* false_start */

};



#endif /* USE_AXTLS */

lib/vtls/axtls.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ CURLcode Curl_axtls_random(struct Curl_easy *data, 
                           unsigned char *entropy,

                           size_t length);



extern const struct Curl_ssl Curl_ssl_axtls;



/* Set the API backend definition to axTLS */

#define CURL_SSL_BACKEND CURLSSLBACKEND_AXTLS

lib/vtls/cyassl.c

+22 −0
Original line number Diff line number Diff line
@@ -951,4 +951,26 @@ void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */ 
  Sha256Final(&SHA256pw, sha256sum);

}



const struct Curl_ssl Curl_ssl_cyassl = {

  "cyassl",                        /* name */



  Curl_cyassl_init,                /* init */

  Curl_none_cleanup,               /* cleanup */

  Curl_cyassl_version,             /* version */

  Curl_none_check_cxn,             /* check_cxn */

  Curl_cyassl_shutdown,            /* shutdown */

  Curl_cyassl_data_pending,        /* data_pending */

  Curl_cyassl_random,              /* random */

  Curl_none_cert_status_request,   /* cert_status_request */

  Curl_cyassl_connect,             /* connect */

  Curl_cyassl_connect_nonblocking, /* connect_nonblocking */

  Curl_cyassl_close,               /* close */

  Curl_none_close_all,             /* close_all */

  Curl_cyassl_session_free,        /* session_free */

  Curl_none_set_engine,            /* set_engine */

  Curl_none_set_engine_default,    /* set_engine_default */

  Curl_none_engines_list,          /* engines_list */

  Curl_none_false_start            /* false_start */

};



#endif

lib/vtls/cyassl.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */ 
                     unsigned char *sha256sum, /* output */

                     size_t unused);



extern const struct Curl_ssl Curl_ssl_cyassl;



/* Set the API backend definition to CyaSSL */

#define CURL_SSL_BACKEND CURLSSLBACKEND_CYASSL

lib/vtls/darwinssl.c

+22 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,28 @@ static ssize_t darwinssl_recv(struct connectdata *conn, 
  return (ssize_t)processed;

}



const struct Curl_ssl Curl_ssl_darwinssl = {

  "darwinssl",                        /* name */



  Curl_none_init,                     /* init */

  Curl_none_cleanup,                  /* cleanup */

  Curl_darwinssl_version,             /* version */

  Curl_darwinssl_check_cxn,           /* check_cxn */

  Curl_darwinssl_shutdown,            /* shutdown */

  Curl_darwinssl_data_pending,        /* data_pending */

  Curl_darwinssl_random,              /* random */

  Curl_none_cert_status_request,      /* cert_status_request */

  Curl_darwinssl_connect,             /* connect */

  Curl_darwinssl_connect_nonblocking, /* connect_nonblocking */

  Curl_darwinssl_close,               /* close */

  Curl_none_close_all,                /* close_all */

  Curl_darwinssl_session_free,        /* session_free */

  Curl_none_set_engine,               /* set_engine */

  Curl_none_set_engine_default,       /* set_engine_default */

  Curl_none_engines_list,             /* engines_list */

  Curl_darwinssl_false_start          /* false_start */

};



#ifdef __clang__

#pragma clang diagnostic pop

#endif