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

vtls: use the Curl_ssl struct to access all SSL backends' functionality 



This is the first step to unify the SSL backend handling. Now all the
SSL backend-specific functionality is accessed via a global instance of
the Curl_ssl struct.

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

lib/vtls/axtls.c

+2 −0
Original line number Diff line number Diff line
@@ -724,4 +724,6 @@ const struct Curl_ssl Curl_ssl_axtls = { 
  Curl_none_false_start           /* false_start */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_axtls;



#endif /* USE_AXTLS */

lib/vtls/axtls.h

+0 −17
Original line number Diff line number Diff line
@@ -51,23 +51,6 @@ extern const struct Curl_ssl Curl_ssl_axtls; 
/* Set the API backend definition to axTLS */

#define CURL_SSL_BACKEND CURLSSLBACKEND_AXTLS



/* API setup for axTLS */

#define curlssl_init Curl_axtls_init

#define curlssl_cleanup Curl_axtls_cleanup

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

#define curlssl_set_engine_default(x) ((void)x, CURLE_NOT_BUILT_IN)

#define curlssl_engines_list(x) ((void)x, (struct curl_slist *)NULL)

#define curlssl_version Curl_axtls_version

#define curlssl_check_cxn(x) Curl_axtls_check_cxn(x)

#define curlssl_data_pending(x,y) ((void)x, (void)y, 0)

#define curlssl_random(x,y,z) Curl_axtls_random(x,y,z)



#endif /* USE_AXTLS */

#endif /* HEADER_CURL_AXTLS_H */

lib/vtls/cyassl.c

+2 −0
Original line number Diff line number Diff line
@@ -973,4 +973,6 @@ const struct Curl_ssl Curl_ssl_cyassl = { 
  Curl_none_false_start            /* false_start */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_cyassl;



#endif

lib/vtls/cyassl.h

+0 −16
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ extern const struct Curl_ssl Curl_ssl_cyassl; 
#define have_curlssl_pinnedpubkey 1

#endif



/* API setup for CyaSSL */

#define curlssl_init Curl_cyassl_init

#define curlssl_cleanup() Curl_nop_stmt

#define curlssl_connect Curl_cyassl_connect

#define curlssl_connect_nonblocking Curl_cyassl_connect_nonblocking

#define curlssl_session_free(x)  Curl_cyassl_session_free(x)

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

#define curlssl_close Curl_cyassl_close

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

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

#define curlssl_set_engine_default(x) ((void)x, CURLE_NOT_BUILT_IN)

#define curlssl_engines_list(x) ((void)x, (struct curl_slist *)NULL)

#define curlssl_version Curl_cyassl_version

#define curlssl_check_cxn(x) ((void)x, -1)

#define curlssl_data_pending(x,y) Curl_cyassl_data_pending(x,y)

#define curlssl_random(x,y,z) Curl_cyassl_random(x,y,z)

#define curlssl_sha256sum(a,b,c,d) Curl_cyassl_sha256sum(a,b,c,d)



#endif /* USE_CYASSL */

lib/vtls/darwinssl.c

+2 −0
Original line number Diff line number Diff line
@@ -2878,6 +2878,8 @@ const struct Curl_ssl Curl_ssl_darwinssl = { 
  Curl_darwinssl_false_start          /* false_start */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_darwinssl;



#ifdef __clang__

#pragma clang diagnostic pop

#endif