From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 14 May 2016 01:23:05 +0000 (-0700)
Subject: Properly reject malformed or empty package sigs
X-Git-Tag: emacs-25.0.94~6
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/6de0715f5467d4b925e2dfe082174529ace3b174?ds=sidebyside

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
---

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