aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-05-13 18:23:05 -0700
committerPaul Eggert2016-05-13 18:23:37 -0700
commit6de0715f5467d4b925e2dfe082174529ace3b174 (patch)
treea667f0db48daa6a34ab3565c38f042783428a775
parentedae7d93ed509aa8a7db3952c70550cf3353d169 (diff)
downloademacs-6de0715f5467d4b925e2dfe082174529ace3b174.tar.gz
emacs-6de0715f5467d4b925e2dfe082174529ace3b174.zip
Properly reject malformed or empty package sigs
Problem report and fix by Lizzie Dixon (Bug#23513). * lisp/emacs-lisp/package.el (package--check-signature-content): Report an error if no good signatures OR if a fatal error. Not AND. Copyright-paperwork-exempt: yes
-rw-r--r--lisp/emacs-lisp/package.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5371f0b9e55..58973dfa920 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1214,7 +1214,7 @@ errors."
1214 (unless (and (eq package-check-signature 'allow-unsigned) 1214 (unless (and (eq package-check-signature 'allow-unsigned)
1215 (eq (epg-signature-status sig) 'no-pubkey)) 1215 (eq (epg-signature-status sig) 'no-pubkey))
1216 (setq had-fatal-error t)))) 1216 (setq had-fatal-error t))))
1217 (when (and (null good-signatures) had-fatal-error) 1217 (when (or (null good-signatures) had-fatal-error)
1218 (package--display-verify-error context sig-file) 1218 (package--display-verify-error context sig-file)
1219 (signal 'bad-signature (list sig-file))) 1219 (signal 'bad-signature (list sig-file)))
1220 good-signatures))) 1220 good-signatures)))