Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
negrutiu committed Aug 31, 2024
1 parent f53a52a commit 8ae4bb8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/nscurl/NScurl.readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ Parameter | Details
/CASTORE true|false
```
Specify that Windows' native CA store should be used for SSL certificate validation.
This option is __enabled__ by default.
This option is `true` by default.
When enabled, the native CA store is used __in addition__ to the other trusted certificate sources ([/CACERT](#cacert) and [/CERT](#cert))

### /CERT
Expand Down
4 changes: 2 additions & 2 deletions src/nscurl/curl.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,12 +643,12 @@ CURLcode CurlSSLCallback( CURL *curl, void *ssl_ctx, void * userdata)
const struct curl_slist* pem;
for (pem = req->pPemList; pem; pem = pem->next)
{
BIO* bio = BIO_new_mem_buf(pem->data, -1);
BIO* bio = BIO_new_mem_buf(pem->data, -1);
if (bio)
{
X509_STORE* store = SSL_CTX_get_cert_store(sslctx);

// read certificates one by one
// read certificates one by one
X509* cert;
while ((cert = PEM_read_bio_X509(bio, NULL, NULL, NULL)) != NULL)
{
Expand Down
1 change: 1 addition & 0 deletions tests/NScurl-Debug.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@ Section "Self-signed certificate"

SectionEnd


SectionGroupEnd


Expand Down
1 change: 1 addition & 0 deletions tests/NScurl-Test.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ Section "Self-signed certificate"
NScurl::cancel /TAG "test" /REMOVE
SectionEnd


SectionGroupEnd


Expand Down
12 changes: 6 additions & 6 deletions vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"version": "1.0.0.0",
"dependencies":
[
{
"name": "curl",
"default-features": false,
"features": ["http2", "openssl", "brotli", "zstd", "tool"]
{
"name": "curl",
"default-features": false,
"features": ["http2", "openssl", "brotli", "zstd", "tool"]
}
],
"vcpkg-configuration": {
"overlay-ports": [ "overlay_ports" ],
"overlay-triplets": [ "overlay_triplets" ]
"overlay-ports": ["overlay_ports"],
"overlay-triplets": ["overlay_triplets"]
}
}

0 comments on commit 8ae4bb8

Please sign in to comment.