]> git.eshelyaron.com Git - emacs.git/commitdiff
Make previous auth-source change not break on Windows without gnutls
authorLars Ingebrigtsen <larsi@gnus.org>
Fri, 20 Sep 2019 20:18:10 +0000 (22:18 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Fri, 20 Sep 2019 20:18:10 +0000 (22:18 +0200)
* lisp/auth-source.el (auth-source--obfuscate)
(auth-source--deobfuscate): Check that gnutls is really available.

lisp/auth-source.el

index a049e05e4d8b5743216d4dfeeb31e13880bbfe90..e608afca2db2f97572df645c233934a2badbd794 100644 (file)
@@ -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