suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: guard default cert location setup with libcrypto check

Browse Source 
Commit dc8a2ca6 removed the check, which caused problems
when libcrypto.so is not found.
This commit is contained in:
Ryan Culpepper 2018-09-17 15:38:45 +02:00
parent 710cbd25bf
commit 0ceb67ebc6
1 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
racket/collects/openssl/mzssl.rkt
View File

@ -363,6 +363,8 @@ TO DO:
(define-crypto X509_get_default_cert_file_env (_fun -> _string)) (define-crypto X509_get_default_cert_file_env (_fun -> _string))
(define (x509-root-sources) (define (x509-root-sources)
(cond
[libcrypto
;; Workaround for natipkg openssl library: the default cert locations vary ;; Workaround for natipkg openssl library: the default cert locations vary
;; from distro to distro, and there is no one configuration that works with ;; from distro to distro, and there is no one configuration that works with
;; all. So build natipkg libssl.so with `--openssldir="/RACKET_USE_ALT_PATH"` ;; all. So build natipkg libssl.so with `--openssldir="/RACKET_USE_ALT_PATH"`
@ -404,7 +406,8 @@ TO DO:
(X509_get_default_cert_file_env) (X509_get_default_cert_file_env)
(X509_get_default_cert_dir_env)))) (X509_get_default_cert_dir_env))))
(log-openssl-debug "using cert sources: ~s, ~s" cert-files cert-dirs) (log-openssl-debug "using cert sources: ~s, ~s" cert-files cert-dirs)
(append cert-files (map (lambda (p) (list 'directory p)) cert-dirs))) (append cert-files (map (lambda (p) (list 'directory p)) cert-dirs))]
[else null]))
(define ssl-default-verify-sources (define ssl-default-verify-sources
(make-parameter (make-parameter