From 52a40b12a8ee2d644b74bffee7402b90bfd2da0a Mon Sep 17 00:00:00 2001 From: Stefan Wurzinger Date: Sun, 23 Feb 2025 13:32:47 +0100 Subject: [PATCH 1/2] fix fbchkdoc documentation mentioning wrong argument names for CA certs --- doc/fbchkdoc/readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/fbchkdoc/readme.txt b/doc/fbchkdoc/readme.txt index 494b3d8109..18e98c569f 100644 --- a/doc/fbchkdoc/readme.txt +++ b/doc/fbchkdoc/readme.txt @@ -175,12 +175,12 @@ the '-ini FILE' command line option to any of the tools. are given. Set or override this url with the '-url URL' command line option - web_cert_file + web_certificate path and file name to the certificate for web url. Selected when the '-web' or '-web+' command line option given. Set or override this option with the '-certificate FILE' command line option. - dev_cert_file + dev_certificate path and file name to the certificate for dev url. Selected when the '-dev' or '-dev+' command line option given. Set or override this option with the '-certificate FILE' command line option. From 9cce3acb3091b579b2fa701e0327921f124848ff Mon Sep 17 00:00:00 2001 From: Stefan Wurzinger Date: Sun, 23 Feb 2025 13:33:48 +0100 Subject: [PATCH 2/2] libfbdoc: enable native CA by default if no custom CA file specified --- doc/libfbdoc/CHttpStream.bas | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/libfbdoc/CHttpStream.bas b/doc/libfbdoc/CHttpStream.bas index d89cf998e6..bb0aac2a1c 100644 --- a/doc/libfbdoc/CHttpStream.bas +++ b/doc/libfbdoc/CHttpStream.bas @@ -164,6 +164,8 @@ namespace fb if( ca_file ) then ret = curl_easy_setopt( curl, CURLOPT_CAINFO, ca_file ) + else + curl_easy_setopt( curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA ) end if '' This option should not be needed. It wasn't in earlier version @@ -302,6 +304,8 @@ namespace fb if( ca_file ) then curl_easy_setopt( curl, CURLOPT_CAINFO, ca_file ) + else + curl_easy_setopt( curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA ) end if ret = curl_easy_perform( curl )