aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/libcurl/curl_global_sslset.33
-rw-r--r--docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.38
-rw-r--r--docs/libcurl/symbols-in-versions1
-rw-r--r--include/curl/curl.h3
-rw-r--r--lib/vtls/mesalink.c2
-rw-r--r--packages/OS400/curl.inc.in2
6 files changed, 13 insertions, 6 deletions
diff --git a/docs/libcurl/curl_global_sslset.3 b/docs/libcurl/curl_global_sslset.3
index 48686ab9e..b17e8ea58 100644
--- a/docs/libcurl/curl_global_sslset.3
+++ b/docs/libcurl/curl_global_sslset.3
@@ -42,7 +42,8 @@ typedef enum {
CURLSSLBACKEND_SCHANNEL = 8,
CURLSSLBACKEND_DARWINSSL = 9,
CURLSSLBACKEND_AXTLS = 10,
- CURLSSLBACKEND_MBEDTLS = 11
+ CURLSSLBACKEND_MBEDTLS = 11,
+ CURLSSLBACKEND_MESALINK = 12
} curl_sslbackend;
.B "CURLsslset curl_global_sslset(curl_sslbackend " id,
diff --git a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3
index c601e4fcf..a0fe2099c 100644
--- a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3
+++ b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3
@@ -56,9 +56,9 @@ The \fIbackend\fP struct member is one of the defines in the CURLSSLBACKEND_*
series: CURLSSLBACKEND_NONE (when built without TLS support),
CURLSSLBACKEND_AXTLS, CURLSSLBACKEND_CYASSL, CURLSSLBACKEND_DARWINSSL,
CURLSSLBACKEND_GNUTLS, CURLSSLBACKEND_GSKIT, CURLSSLBACKEND_MBEDTLS,
-CURLSSLBACKEND_NSS, CURLSSLBACKEND_OPENSSL, CURLSSLBACKEND_POLARSSL or
-CURLSSLBACKEND_SCHANNEL. (Note that the OpenSSL forks are all reported as just
-OpenSSL here.)
+CURLSSLBACKEND_NSS, CURLSSLBACKEND_OPENSSL, CURLSSLBACKEND_POLARSSL,
+CURLSSLBACKEND_SCHANNEL or CURLSSLBACKEND_MESALINK. (Note that the OpenSSL
+forks are all reported as just OpenSSL here.)
The \fIinternals\fP struct member will point to a TLS library specific pointer
for the active ("in use") SSL connection, with the following underlying types:
@@ -89,6 +89,8 @@ CtxtHandle *
SSLContext *
.IP "WolfSSL (formerly CyaSSL)"
SSL *
+.IP "MesaLink"
+SSL *
.RE
If the \fIinternals\fP pointer is NULL then either the SSL backend is not
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index a60a7148b..fa0d6f710 100644
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -708,6 +708,7 @@ CURLSSLBACKEND_GNUTLS 7.34.0
CURLSSLBACKEND_GSKIT 7.34.0
CURLSSLBACKEND_LIBRESSL 7.49.0
CURLSSLBACKEND_MBEDTLS 7.46.0
+CURLSSLBACKEND_MESALINK 7.62.0
CURLSSLBACKEND_NONE 7.34.0
CURLSSLBACKEND_NSS 7.34.0
CURLSSLBACKEND_OPENSSL 7.34.0
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 2cd611818..cf6f01de9 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -146,7 +146,8 @@ typedef enum {
CURLSSLBACKEND_SCHANNEL = 8,
CURLSSLBACKEND_DARWINSSL = 9,
CURLSSLBACKEND_AXTLS = 10,
- CURLSSLBACKEND_MBEDTLS = 11
+ CURLSSLBACKEND_MBEDTLS = 11,
+ CURLSSLBACKEND_MESALINK = 12
} curl_sslbackend;
/* aliases for library clones and renames */
diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c
index 8198fa1c8..6a2b67e63 100644
--- a/lib/vtls/mesalink.c
+++ b/lib/vtls/mesalink.c
@@ -596,7 +596,7 @@ Curl_mesalink_get_internals(struct ssl_connect_data *connssl,
}
const struct Curl_ssl Curl_ssl_mesalink = {
- { CURLSSLBACKEND_WOLFSSL, "MesaLink" }, /* info */
+ { CURLSSLBACKEND_MESALINK, "MesaLink" }, /* info */
SSLSUPP_SSL_CTX,
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 8b150ed88..2cf7899bd 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -1598,6 +1598,8 @@
d c 10
d CURLSSLBACKEND_MBEDTLS...
d c 11
+ d CURLSSLBACKEND_MESALINK...
+ d c 12
* Aliases for clones.
d CURLSSLBACKEND_LIBRESSL...
d c 1