Recognize Android TLS certificates by default

* lisp/net/gnutls.el (gnutls-trustfiles): Append directories
holding system and user-provided certificates on Android.

(cherry picked from commit f2f13fa630bd2658ea3f90c4362fe6201d32e67e)

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index b0c3dcb9a7061fe83f3100387f08cb8be75ae76d..b5fb4d47d5754f3aec8539dea267e18e69141aa2 100644 (file)
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -111,6 +111,10 @@ Security'."
     "/usr/local/share/certs/ca-root-nss.crt" ; FreeBSD
     "/etc/ssl/cert.pem"                      ; macOS, Dragora, Parabola
     "/etc/certs/ca-certificates.crt"         ; OpenIndiana
+    "/system/etc/security/cacerts/*"        ; Android system
+    "/system/etc/security/cacerts_supl/*"    ; Android, supplementary
+    "/system/etc/security/cacerts_google/*"  ; Android, Google
+    "/data/misc/user/0/cacerts-added/*"             ; Android, user-specified (?)
     )
   "List of CA bundle location filenames or a function returning said list.
 If a file path contains glob wildcards, they will be expanded.