summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-08-27 08:48:27 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-08-27 08:49:14 +0200
commitf9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad (patch)
tree04e508cae2726190c2b42af0a294b1e97ba6e7f3 /gnu
parent32e18e9b9471e863e5857a89683f358bfb91c157 (diff)
downloadpatches-f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad.tar
patches-f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad.tar.gz
services: cups: Complete SSL-OPTIONS.
…except for ‘AllowDH’, which makes no sense on GNU TLS systems. * gnu/services/cups.scm (ssl-options?): Validate ‘DenyCBC’ and ‘DenyTLS1.0’. * doc/guix.texi (Printing Services): Document them both.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/cups.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm
index 9d21b6e70c..c20244cb32 100644
--- a/gnu/services/cups.scm
+++ b/gnu/services/cups.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -170,7 +171,10 @@
(define (ssl-options? x)
(and (list? x)
- (and-map (lambda (elt) (memq elt '(AllowRC4 AllowSSL3))) x)))
+ (and-map (lambda (elt) (memq elt '(AllowRC4
+ AllowSSL3
+ DenyCBC
+ DenyTLS1.0))) x)))
(define (serialize-ssl-options field-name val)
(serialize-field field-name
(match val