vtls: add MesaLink to curl_sslbackend enum

MesaLink support was added in commit 57348eb97d1b8fc3742e02c but the
backend was never added to the curl_sslbackend enum in curl/curl.h.
This adds the new backend to the enum and updates the relevant docs.

Closes #3195
Reviewed-by: Daniel Stenberg <daniel@haxx.se>

diff --git a/docs/libcurl/curl_global_sslset.3 b/docs/libcurl/curl_global_sslset.3
index 48686ab9ee3ea9d0ee96c0687e7d94ade7ed9d3b..b17e8ea5883622c096227d54304603511ea72d01 100644 (file)
--- 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 c601e4fcfc48061d80a6faea28ecf3a5e922e471..a0fe2099cfacc723288c39d6f4d5c85f8c8f5366 100644 (file)
--- 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 a60a7148b5218f922a1a85176f3408635e07c473..fa0d6f710b433c27371a92e01b3b097a8e583c57 100644 (file)
--- 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 2cd6118185bba636d4ed6c2e2d7d37f806e477b3..cf6f01de9e8cbf31487ad2cca240818f9deb266e 100644 (file)
--- 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 8198fa1c8a0bcd3982bfb1329770ddb26b10fd6f..6a2b67e633192e496705bd48730aaae8e559387f 100644 (file)
--- 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 8b150ed88b798ee9dd1caf26e680ef7ac5e8a20b..2cf7899bd4ceb6d1631b2594465d28211dd07c05 100644 (file)
--- 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