vtls: have the backend tell if it supports CERTINFO

diff --git a/lib/url.c b/lib/url.c
index b4d4a3919e3d8b4f2ec046e01ceb3f23d0cfe352..3e90d4e30b0db0ae90d51f70214052e920d2686a 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -1977,12 +1977,13 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
     data->set.ssl.fsslctxp = va_arg(param, void *);
     break;
 #endif
-#if defined(USE_SSLEAY) || defined(USE_QSOSSL) || defined(USE_GSKIT) || \
-    defined(USE_NSS)
   case CURLOPT_CERTINFO:
+#ifdef have_curlssl_certinfo
     data->set.ssl.certinfo = (0 != va_arg(param, long))?TRUE:FALSE;
-    break;
+#else
+    result = CURLE_NOT_BUILT_IN;
 #endif
+    break;
   case CURLOPT_CAINFO:
     /*
      * Set CA info for SSL connection. Specify file name of the CA certificate

diff --git a/lib/vtls/gskit.h b/lib/vtls/gskit.h
index a4caa6f23e4987794bf9bc23af7762acef7d19cc..7d1eb2282163982115ad4fd558243bb2b133c80f 100644 (file)
--- a/lib/vtls/gskit.h
+++ b/lib/vtls/gskit.h
@@ -42,6 +42,9 @@ int Curl_gskit_shutdown(struct connectdata * conn, int sockindex);
 size_t Curl_gskit_version(char * buffer, size_t size);
 int Curl_gskit_check_cxn(struct connectdata * cxn);
 
+/* this backend supports CURLOPT_CERTINFO */
+#define have_curlssl_certinfo 1
+
 /* API setup for GSKit */
 #define curlssl_init Curl_gskit_init
 #define curlssl_cleanup Curl_gskit_cleanup

diff --git a/lib/vtls/nssg.h b/lib/vtls/nssg.h
index 311f873d7ab69ae8c56215aa4b8ccf72507006bb..81e794902266a2b7db039725b0b71cec229e78af 100644 (file)
--- a/lib/vtls/nssg.h
+++ b/lib/vtls/nssg.h
@@ -63,6 +63,9 @@ void Curl_nss_md5sum(unsigned char *tmp, /* input */
 /* this backend provides these functions: */
 #define have_curlssl_md5sum 1
 
+/* this backend supports CURLOPT_CERTINFO */
+#define have_curlssl_certinfo 1
+
 /* API setup for NSS */
 #define curlssl_init Curl_nss_init
 #define curlssl_cleanup Curl_nss_cleanup

diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index 6d6c75c829a233979c7c8922d7fe017ff1aa7dfa..e6f205170c665ffc0b1ae4133ce26adad413d646 100644 (file)
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -79,6 +79,9 @@ void Curl_ossl_md5sum(unsigned char *tmp, /* input */
 /* this backend supports the CAPATH option */
 #define have_ca_path 1
 
+/* this backend supports CURLOPT_CERTINFO */
+#define have_curlssl_certinfo 1
+
 /* API setup for OpenSSL */
 #define curlssl_init Curl_ossl_init
 #define curlssl_cleanup Curl_ossl_cleanup

diff --git a/lib/vtls/qssl.h b/lib/vtls/qssl.h
index 9764eecbe7a284547a553ce10b211f2d1fa73cc0..07edb67e0b392a53df63f85251dbc98225d8dd87 100644 (file)
--- a/lib/vtls/qssl.h
+++ b/lib/vtls/qssl.h
@@ -40,6 +40,9 @@ int Curl_qsossl_shutdown(struct connectdata * conn, int sockindex);
 size_t Curl_qsossl_version(char * buffer, size_t size);
 int Curl_qsossl_check_cxn(struct connectdata * cxn);
 
+/* this backend supports CURLOPT_CERTINFO */
+#define have_curlssl_certinfo 1
+
 /* API setup for QsoSSL */
 #define curlssl_init Curl_qsossl_init
 #define curlssl_cleanup Curl_qsossl_cleanup