From: ludo@gnu.org (Ludovic Courtès)
To: Mark H Weaver <mhw@netris.org>
Cc: 26948@debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: bug#26948: gnutls errors on multiple guix commands
Date: Tue, 30 May 2017 13:25:40 +0200 [thread overview]
Message-ID: <87bmqa8u2z.fsf@gnu.org> (raw)
In-Reply-To: <87a85v1hik.fsf@netris.org> (Mark H. Weaver's message of "Mon, 29 May 2017 17:26:43 -0400")
Hi Mark,
Mark H Weaver <mhw@netris.org> skribis:
>> In the meantime we can work around it this way:
>>
>> diff --git a/guix/build/download.scm b/guix/build/download.scm
>> index ce4708a87..6ef623334 100644
>> --- a/guix/build/download.scm
>> +++ b/guix/build/download.scm
>> @@ -296,6 +296,13 @@ session record port using PORT as its underlying communication port."
>> (make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY")
>> (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)
>> "Return certificate credentials with X.509 authority certificates read from
>> DIRECTORY. Those authority certificates are checked when
>> @@ -309,7 +316,7 @@ DIRECTORY. Those authority certificates are checked when
>> (let ((file (string-append directory "/" file)))
>> ;; Protect against dangling symlinks.
>> (when (file-exists? file)
>> - (set-certificate-credentials-x509-trust-file!
>> + (set-certificate-credentials-x509-trust-file!*
>> cred file
>> x509-certificate-format/pem))))
>> (or files '()))
>>
>>
>> WDYT? I’ll commit it if that’s fine with you.
>
> I'm not sufficiently familiar with GnuTLS to properly review this, but I
> trust your judgement.
Pushed as 27fd13c3c2701204f48fe0012438edbb91957dfc.
Thanks,
Ludo’.
next prev parent reply other threads:[~2017-05-30 11:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 5:19 bug#26948: gnutls errors on multiple guix commands Maxim Cournoyer
2017-05-17 12:56 ` Ludovic Courtès
2017-05-25 7:26 ` Maxim Cournoyer
2017-05-26 8:56 ` Ludovic Courtès
2017-05-28 18:38 ` Mark H Weaver
2017-05-29 4:36 ` Maxim Cournoyer
2017-05-29 9:31 ` Ludovic Courtès
2017-05-29 21:26 ` Mark H Weaver
2017-05-30 11:25 ` Ludovic Courtès [this message]
2017-05-28 21:00 ` Maxim Cournoyer
2017-05-29 9:12 ` bug#26948: ‘write-file’ output should not be locale-dependent Ludovic Courtès
2017-05-29 20:15 ` Maxim Cournoyer
2017-05-30 11:57 ` Ludovic Courtès
2017-06-16 15:09 ` Ludovic Courtès
2017-07-27 12:55 ` Ludovic Courtès
2021-01-08 22:04 ` bug#26948: 'guix publish' file name decoding is locale-dependent Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bmqa8u2z.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=26948@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=mhw@netris.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).