mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-07 21:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #17658; add cert dir for ssl ctx (#19920)

Browse Source 
add cert dir for ssl ctx

Co-authored-by: Paul Roberts <pmr@stelo.org.uk>
Co-authored-by: sandytypical <43030857+xflywind@users.noreply.github.com>
Co-authored-by: Clay Sweetser <Varriount@users.noreply.github.com>
This commit is contained in:
ringabout
2022-08-29 10:16:19 +08:00
committed by GitHub
parent ee11302c24
commit 04642335c1
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pure/net.nim
View File

@@ -696,7 +696,11 @@ when defineSsl:
var found = false
let useEnvVars = (if verifyMode == CVerifyPeerUseEnvVars: true else: false)
for fn in scanSSLCertificates(useEnvVars = useEnvVars):
if newCTX.SSL_CTX_load_verify_locations(fn.cstring, nil) == VerifySuccess:
if fn.extractFilename == "":
if newCTX.SSL_CTX_load_verify_locations(nil, cstring(fn.normalizePathEnd(false))) == VerifySuccess:
found = true
break
elif newCTX.SSL_CTX_load_verify_locations(cstring(fn), nil) == VerifySuccess:
found = true
break
if not found:

6
lib/pure/ssl_certs.nim
View File

@@ -126,7 +126,13 @@ iterator scanSSLCertificates*(useEnvVars = false): string =
if fileExists(p):
yield p
elif dirExists(p):
# check if it's a dir where each cert is one file
# named by it's hasg
for fn in joinPath(p, "*.0").walkFiles:
yield p.normalizePathEnd(true)
break
for fn in joinPath(p, "*").walkFiles():
yield fn
else:
var