diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
| commit | ebbb7286b91e21cb26153e3d0a3ea8017cf16224 (patch) | |
| tree | c41eccbe937b0541109cc3b2d45c372ebf826755 /guix/build | |
| parent | d41f63942b5df85223f5fae110253bc30869653b (diff) | |
| parent | aefa29123feaf4202010675eae0a563b3ee90cf1 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/download.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm index c08221b3b2..a64e0f0bd3 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -157,7 +157,8 @@ out if the connection could not be established in less than TIMEOUT seconds." ;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; See <http://bugs.gnu.org/12202>. (module-autoload! (current-module) - '(gnutls) '(make-session connection-end/client)) + '(gnutls) + '(gnutls-version make-session connection-end/client)) (define %tls-ports ;; Mapping of session record ports to the underlying file port. @@ -268,7 +269,18 @@ host name without trailing dot." ;; "(gnutls) Priority Strings"); see <http://bugs.gnu.org/23311>. ;; Explicitly disable SSLv3, which is insecure: ;; <https://tools.ietf.org/html/rfc7568>. - (set-session-priorities! session "NORMAL:%COMPAT:-VERS-SSL3.0") + ;; + ;; FIXME: Since we currently fail to handle TLS 1.3 (with GnuTLS 3.6.5), + ;; remove it; see <https://bugs.gnu.org/34102>. + (set-session-priorities! session + (string-append + "NORMAL:%COMPAT:-VERS-SSL3.0" + + ;; The "VERS-TLS1.3" priority string is not + ;; supported by GnuTLS 3.5. + (if (string-prefix? "3.5." (gnutls-version)) + "" + ":-VERS-TLS1.3"))) (set-session-credentials! session (if (and verify-certificate? ca-certs) |