diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 18:23:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 18:23:37 -0700 |
| commit | 6de0715f5467d4b925e2dfe082174529ace3b174 (patch) | |
| tree | a667f0db48daa6a34ab3565c38f042783428a775 | |
| parent | edae7d93ed509aa8a7db3952c70550cf3353d169 (diff) | |
| download | emacs-6de0715f5467d4b925e2dfe082174529ace3b174.tar.gz | |
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.el | 2 |
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." (unless (and (eq package-check-signature 'allow-unsigned) (eq (epg-signature-status sig) 'no-pubkey)) (setq had-fatal-error t)))) - (when (and (null good-signatures) had-fatal-error) + (when (or (null good-signatures) had-fatal-error) (package--display-verify-error context sig-file) (signal 'bad-signature (list sig-file))) good-signatures))) |