summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-09-20 22:18:10 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-09-20 22:18:10 +0200
commit76c14b7191f5c30ceeb06a546b44b3bac03ea8e0 (patch)
tree7a272cf8351c2ac454be50444d6970c32dbf3708
parent46b49d9ece4ef6a14d661abd261d9cbeff1f237b (diff)
downloademacs-76c14b7191f5c30ceeb06a546b44b3bac03ea8e0.tar.gz
Make previous auth-source change not break on Windows without gnutls
* lisp/auth-source.el (auth-source--obfuscate) (auth-source--deobfuscate): Check that gnutls is really available.
-rw-r--r--lisp/auth-source.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index a049e05e4d8..e608afca2db 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1168,7 +1168,8 @@ FILE is the file from which we obtained this token."
(setq auth-source--session-nonce
(apply #'string (cl-loop repeat 10
collect (random 128)))))
- (if (fboundp 'gnutls-symmetric-encrypt)
+ (if (and (fboundp 'gnutls-symmetric-encrypt)
+ (gnutls-available-p))
(let ((cdata (car (last (gnutls-ciphers)))))
(mapconcat
#'base64-encode-string
@@ -1188,7 +1189,8 @@ FILE is the file from which we obtained this token."
(concat s (make-string (- length (mod (length s) length)) ?\0)))
(defun auth-source--deobfuscate (data)
- (if (fboundp 'gnutls-symmetric-encrypt)
+ (if (and (fboundp 'gnutls-symmetric-encrypt)
+ (gnutls-available-p))
(let ((cdata (car (last (gnutls-ciphers))))
(bits (split-string data "-")))
(substring