diff options
author | Chong Yidong <cyd@gnu.org> | 2012-01-09 15:48:51 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-01-09 15:48:51 +0800 |
commit | 1de76afef25d814c84b37045b229326d02915d80 (patch) | |
tree | 2be69192b0b3b03bdff0c8e4cc878bf668820a1e /lisp/custom.el | |
parent | 6a43ef8e8508df7d732e639ec75f657f4363e27a (diff) | |
download | emacs-1de76afef25d814c84b37045b229326d02915d80.tar.gz emacs-1de76afef25d814c84b37045b229326d02915d80.tar.bz2 emacs-1de76afef25d814c84b37045b229326d02915d80.zip |
* lisp/custom.el (custom-safe-themes): Use SHA-256 for hashing.
* doc/emacs/custom.texi (Custom Themes): Switched custom-safe-themes
to use SHA-256.
Diffstat (limited to 'lisp/custom.el')
-rw-r--r-- | lisp/custom.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index d3752789e28..2ccfe094933 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1105,7 +1105,7 @@ property `theme-feature' (which is usually a symbol created by (defcustom custom-safe-themes '(default) "Themes that are considered safe to load. -If the value is a list, each element should be either the `sha1' +If the value is a list, each element should be either the SHA-256 hash of a safe theme file, or the symbol `default', which stands for any theme in the built-in Emacs theme directory (a directory named \"themes\" in `data-directory'). @@ -1161,7 +1161,7 @@ Return t if THEME was successfully loaded, nil otherwise." (error "Unable to find theme file for `%s'" theme)) (with-temp-buffer (insert-file-contents fn) - (setq hash (sha1 (current-buffer))) + (setq hash (secure-hash 'sha256 (current-buffer))) ;; Check file safety with `custom-safe-themes', prompting the ;; user if necessary. (when (or no-confirm |