nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

download: Work around GnuTLS bug with UTF-8 certificate file names. 

Reported by Mark H Weaver <mhw@netris.org>
at <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26948#17>.

* guix/build/download.scm (set-certificate-credentials-x509-trust-file!*):
New procedure.
(make-credendials-with-ca-trust-files): Use it instead of
'set-certificate-credentials-x509-trust-file!'.
This commit is contained in:
Ludovic Courtès 2017-05-30 10:11:13 +02:00
parent 98b9732cb8
commit 27fd13c3c2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/build/download.scm
View File

@ -296,6 +296,13 @@ session record port using PORT as its underlying communication port."
(make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY") (make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY")
(getenv "SSL_CERT_DIR")))) ;like OpenSSL (getenv "SSL_CERT_DIR")))) ;like OpenSSL
(define (set-certificate-credentials-x509-trust-file!* cred file format)
"Like 'set-certificate-credentials-x509-trust-file!', but without the file
name decoding bug described at
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26948#17>."
(let ((data (call-with-input-file file get-bytevector-all)))
(set-certificate-credentials-x509-trust-data! cred data format)))
(define (make-credendials-with-ca-trust-files directory) (define (make-credendials-with-ca-trust-files directory)
"Return certificate credentials with X.509 authority certificates read from "Return certificate credentials with X.509 authority certificates read from
DIRECTORY. Those authority certificates are checked when DIRECTORY. Those authority certificates are checked when
@ -309,7 +316,7 @@ DIRECTORY. Those authority certificates are checked when
(let ((file (string-append directory "/" file))) (let ((file (string-append directory "/" file)))
;; Protect against dangling symlinks. ;; Protect against dangling symlinks.
(when (file-exists? file) (when (file-exists? file)
(set-certificate-credentials-x509-trust-file! (set-certificate-credentials-x509-trust-file!*
cred file cred file
x509-certificate-format/pem)))) x509-certificate-format/pem))))
(or files '())) (or files '()))