From: Ted Zlatanov <tzz@lifelogs.com>
To: emacs-devel@gnu.org
Subject: Re: need help with certificate bundles for ALL the platforms Emacs supports
Date: Sun, 12 Feb 2012 17:13:25 -0500 [thread overview]
Message-ID: <87fwef8zui.fsf@lifelogs.com> (raw)
In-Reply-To: jwv1uq234d2.fsf-monnier+emacs@gnu.org
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
On Fri, 10 Feb 2012 13:57:18 -0500 Stefan Monnier <monnier@iro.umontreal.ca> wrote:
>> Maintainers: can I change gnutls.el to provide a customizable
>> `gnutls-trustfiles' and to probe these file locations or would you
>> consider that a new feature that has to wait?
SM> I think it's OK to install now, but please show us the patch for
SM> confirmation,
No ChangeLog yet, just the code. It's pretty simple.
`gnutls-flatten-list' seems like a nice general utility, maybe it
already exists?
Thanks
Ted
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnutls-trustfiles.patch --]
[-- Type: text/x-diff, Size: 2712 bytes --]
=== modified file 'lisp/net/gnutls.el'
--- lisp/net/gnutls.el 2012-02-12 21:40:25 +0000
+++ lisp/net/gnutls.el 2012-02-12 22:11:53 +0000
@@ -51,6 +51,22 @@
:type '(choice (const nil)
string))
+(defcustom gnutls-trustfiles '(
+ ;; Debian, Ubuntu, Gentoo and Arch Linux
+ "/etc/ssl/certs/ca-certificates.crt"
+ ;; Fedora and RHEL
+ "/etc/pki/tls/certs/ca-bundle.crt"
+ ;; Suse
+ "/etc/ssl/ca-bundle.pem"
+ )
+ "List of functions or filenames yielding CA bundle locations.
+The files may be in PEM or DER format, as per the GnuTLS documentation.
+The files may not exist, in which case they will be ignored.
+Functions will be called and may return a filename or a list of filenames."
+ :group 'gnutls
+ :type '(repeat (choice (function :tag "Function")
+ (file :tag "Bundle filename"))))
+
;;;###autoload
(defcustom gnutls-min-prime-bits nil
"The minimum number of bits to be used in Diffie-Hellman key exchange.
@@ -156,10 +172,14 @@
It must be omitted, a number, or nil; if omitted or nil it
defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
(let* ((type (or type 'gnutls-x509pki))
- (default-trustfile "/etc/ssl/certs/ca-certificates.crt")
(trustfiles (or trustfiles
- (when (file-exists-p default-trustfile)
- (list default-trustfile))))
+ (delq nil
+ (mapcar (lambda (f) (and f (file-exists-p f) f))
+ (gnutls-flatten-list
+ (mapcar (lambda (tf) (if (functionp tf)
+ (funcall tf)
+ tf))
+ gnutls-trustfiles))))))
(priority-string (or priority-string
(cond
((eq type 'gnutls-anon)
@@ -203,6 +223,17 @@
doit (gnutls-error-string doit)
(apply 'format format (or params '(nil))))))
+;; copied from `eshell-flatten-list'
+(defun gnutls-flatten-list (args)
+ "Flatten any lists within ARGS, so that there are no sublists."
+ (let ((new-list (list t)))
+ (dolist (a args)
+ (if (and (listp a)
+ (listp (cdr a)))
+ (nconc new-list (eshell-flatten-list a))
+ (nconc new-list (list a))))
+ (cdr new-list)))
+
(provide 'gnutls)
;;; gnutls.el ends here
next prev parent reply other threads:[~2012-02-12 22:13 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 2:02 Emacs 24.0.93 Pretest Windows Binaries published Christoph Scholtes
2012-01-30 4:55 ` Drew Adams
2012-01-30 17:47 ` Eli Zaretskii
2012-01-30 18:17 ` [h-e-w] " Drew Adams
2012-01-30 18:57 ` Eli Zaretskii
2012-01-30 19:08 ` Drew Adams
2012-01-30 19:09 ` Eli Zaretskii
2012-01-30 18:49 ` Eli Zaretskii
2012-01-31 14:03 ` Christoph Scholtes
2012-01-31 14:15 ` Drew Adams
2012-02-02 19:22 ` Ted Zlatanov
2012-02-02 19:52 ` Drew Adams
2012-02-02 21:46 ` Ted Zlatanov
2012-02-02 22:05 ` Drew Adams
2012-02-03 13:26 ` Ted Zlatanov
2012-02-03 7:48 ` Eli Zaretskii
2012-02-03 13:23 ` GnuTLS invasion of Emacs (was: Emacs 24.0.93 Pretest Windows Binaries published) Ted Zlatanov
2012-02-03 16:29 ` GnuTLS invasion of Emacs published) Eli Zaretskii
2012-02-03 16:51 ` Ted Zlatanov
2012-02-09 14:16 ` need help with certificate bundles for ALL the platforms Emacs supports (was: GnuTLS invasion of Emacs published)) Ted Zlatanov
2012-02-09 18:53 ` Eli Zaretskii
2012-02-10 13:06 ` need help with certificate bundles for ALL the platforms Emacs supports Ted Zlatanov
2012-02-10 15:51 ` Eli Zaretskii
2012-02-10 16:37 ` Ted Zlatanov
2012-02-11 17:22 ` Andy Moreton
2012-02-11 17:45 ` Eli Zaretskii
2012-02-12 2:43 ` Ted Zlatanov
2012-02-12 4:05 ` Eli Zaretskii
2012-02-12 13:36 ` Ted Zlatanov
2012-02-13 10:29 ` Andy Moreton
2012-02-13 13:15 ` Ted Zlatanov
2012-02-10 17:11 ` Ted Zlatanov
2012-02-10 18:57 ` Stefan Monnier
2012-02-12 22:13 ` Ted Zlatanov [this message]
2012-02-13 3:28 ` Stefan Monnier
2012-02-13 13:24 ` Ted Zlatanov
2012-02-13 15:12 ` Stefan Monnier
2012-02-13 16:30 ` Ted Zlatanov
2012-02-13 21:04 ` Stefan Monnier
2012-02-13 21:54 ` Ted Zlatanov
2012-02-13 21:55 ` Lars Ingebrigtsen
2012-02-13 22:20 ` Stefan Monnier
2012-02-14 0:05 ` Ted Zlatanov
2012-02-14 2:13 ` Stefan Monnier
2012-02-14 2:32 ` Glenn Morris
2012-02-14 13:01 ` Ted Zlatanov
2012-02-03 13:25 ` Emacs 24.0.93 Pretest Windows Binaries published Stefan Monnier
2012-02-03 0:48 ` [h-e-w] " Richard M. Heiberger
2012-02-03 8:12 ` Eli Zaretskii
2012-02-03 10:03 ` Stephen J. Turnbull
2012-02-03 10:31 ` Eli Zaretskii
2012-02-03 13:49 ` Stephen J. Turnbull
2012-02-03 15:44 ` Eli Zaretskii
2012-02-12 4:04 ` Lennart Borgman
2012-02-12 4:08 ` Lennart Borgman
2012-02-12 16:23 ` Eli Zaretskii
2012-02-12 22:19 ` Lennart Borgman
2012-02-13 3:29 ` Stefan Monnier
2012-02-13 3:51 ` Eli Zaretskii
2012-02-13 19:23 ` Lennart Borgman
2012-02-14 22:43 ` Lennart Borgman
-- strict thread matches above, loose matches on Subject: below --
2012-02-13 22:30 need help with certificate bundles for ALL the platforms Emacs supports nyc4bos
2012-02-14 13:14 ` Ted Zlatanov
2012-02-14 14:04 ` Andy Moreton
2012-02-14 15:53 ` Ted Zlatanov
2012-02-16 18:47 ` nyc4bos
2012-02-17 13:06 ` Ted Zlatanov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fwef8zui.fsf@lifelogs.com \
--to=tzz@lifelogs.com \
--cc=emacs-devel@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.