Imported Upstream version 7.50.2

[platform/upstream/curl.git] / lib / vtls / mbedtls.h

diff --git a/lib/vtls/mbedtls.h b/lib/vtls/mbedtls.h
index fcf483f..1021d54 100644 (file)
--- a/lib/vtls/mbedtls.h
+++ b/lib/vtls/mbedtls.h
@@ -26,10 +26,12 @@
 
 #ifdef USE_MBEDTLS
 
-/* Called on first use mbedTLS, setup threading if supported */
-int  mbedtls_init(void);
-void mbedtls_cleanup(void);
+#include <mbedtls/sha256.h>
 
+/* Called on first use mbedTLS, setup threading if supported */
+int  Curl_mbedtls_init(void);
+void Curl_mbedtls_cleanup(void);
+int Curl_mbedtls_data_pending(const struct connectdata *conn, int sockindex);
 
 CURLcode Curl_mbedtls_connect(struct connectdata *conn, int sockindex);
 
@@ -39,7 +41,7 @@ CURLcode Curl_mbedtls_connect_nonblocking(struct connectdata *conn,
 
 /* tell mbedTLS to close down all open information regarding connections (and
    thus session ID caching etc) */
-void Curl_mbedtls_close_all(struct SessionHandle *data);
+void Curl_mbedtls_close_all(struct Curl_easy *data);
 
  /* close a SSL connection */
 void Curl_mbedtls_close(struct connectdata *conn, int sockindex);
@@ -48,9 +50,12 @@ void Curl_mbedtls_session_free(void *ptr);
 size_t Curl_mbedtls_version(char *buffer, size_t size);
 int Curl_mbedtls_shutdown(struct connectdata *conn, int sockindex);
 
+/* this backends supports CURLOPT_PINNEDPUBLICKEY */
+#define have_curlssl_pinnedpubkey 1
+
 /* API setup for mbedTLS */
-#define curlssl_init() mbedtls_init()
-#define curlssl_cleanup() mbedtls_cleanup()
+#define curlssl_init() Curl_mbedtls_init()
+#define curlssl_cleanup() Curl_mbedtls_cleanup()
 #define curlssl_connect Curl_mbedtls_connect
 #define curlssl_connect_nonblocking Curl_mbedtls_connect_nonblocking
 #define curlssl_session_free(x)  Curl_mbedtls_session_free(x)
@@ -62,7 +67,7 @@ int Curl_mbedtls_shutdown(struct connectdata *conn, int sockindex);
 #define curlssl_engines_list(x) (x=x, (struct curl_slist *)NULL)
 #define curlssl_version Curl_mbedtls_version
 #define curlssl_check_cxn(x) (x=x, -1)
-#define curlssl_data_pending(x,y) (x=x, y=y, 0)
+#define curlssl_data_pending(x,y) Curl_mbedtls_data_pending(x, y)
 #define CURL_SSL_BACKEND CURLSSLBACKEND_MBEDTLS
 #define curlssl_sha256sum(a,b,c,d) mbedtls_sha256(a,b,c,0)