procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-25

Browse source 
6de0715 Properly reject malformed or empty package sigs
edae7d9 Remove buggy non-native image scrolling
This commit is contained in:
Paul Eggert 2016-05-13 18:26:15 -07:00
commit c8109d9c40
2 changed files with 10 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/package.el
View file

@ -1218,7 +1218,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)))