[Emacs-diffs] emacs-25 6de0715: Properly reject malformed or empty package sigs

[Paul Eggert]

branch: emacs-25
commit 6de0715f5467d4b925e2dfe082174529ace3b174
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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
---
 lisp/emacs-lisp/package.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5371f0b..58973df 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)))