Skip to content

Commit a3df859

Browse files
authored
Merge pull request #442 from swurzinger/stw/libfbdoc-ssl-fix
libfbdoc SSL: try to use native CA certs, fix readme
2 parents d64649a + 9cce3ac commit a3df859

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

doc/fbchkdoc/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,12 @@ the '-ini FILE' command line option to any of the tools.
175175
are given. Set or override this url with the '-url URL' command
176176
line option
177177

178-
web_cert_file
178+
web_certificate
179179
path and file name to the certificate for web url. Selected when the
180180
'-web' or '-web+' command line option given. Set or override this
181181
option with the '-certificate FILE' command line option.
182182

183-
dev_cert_file
183+
dev_certificate
184184
path and file name to the certificate for dev url. Selected when the
185185
'-dev' or '-dev+' command line option given. Set or override this
186186
option with the '-certificate FILE' command line option.

doc/libfbdoc/CHttpStream.bas

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ namespace fb
164164

165165
if( ca_file ) then
166166
ret = curl_easy_setopt( curl, CURLOPT_CAINFO, ca_file )
167+
else
168+
curl_easy_setopt( curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA )
167169
end if
168170

169171
'' This option should not be needed. It wasn't in earlier version
@@ -302,6 +304,8 @@ namespace fb
302304

303305
if( ca_file ) then
304306
curl_easy_setopt( curl, CURLOPT_CAINFO, ca_file )
307+
else
308+
curl_easy_setopt( curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA )
305309
end if
306310

307311
ret = curl_easy_perform( curl )

0 commit comments

Comments
 (0)