use ca-certificates instead of frequently updating Google cert

2 files changed, 15 insertions, 15 deletions

diff --git a/_msmtprc b/_msmtprc
index e08bbf0..7a2b3a1 100644
--- a/_msmtprc
+++ b/_msmtprc
@@ -26,7 +26,7 @@ tls_starttls        on
 tls_certcheck       on
 # Just use `tls_fingerprint' for better security.
 # If use `tls_trust_file', the `tls_crl_file' should also be used.
-#tls_trust_file      ~/.private/ca-certificates.crt
+tls_trust_file      ~/.private/ca-certificates.crt
 logfile             ~/.msmtp/msmtp.log
 
 
@@ -35,7 +35,7 @@ account             gmail-aly
 host                smtp.gmail.com
 # Fingerprint of a single certificate to accept for TLS
 # Validity: Wed 02 Mar 2016 06:38:07 PM CST - Tue 31 May 2016 08:00:00 AM CST
-tls_fingerprint     9A:55:E3:4C:C1:B1:43:3A:24:B0:FF:9A:3F:BF:7A:8B:14:F6:52:A0
+#tls_fingerprint     9A:55:E3:4C:C1:B1:43:3A:24:B0:FF:9A:3F:BF:7A:8B:14:F6:52:A0
 from                aaronly.me@gmail.com
 user                aaronly.me@gmail.com
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/gmail-aly.gpg"
@@ -45,7 +45,7 @@ passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.pri
 account             gmail-li
 host                smtp.gmail.com
 # Validity: Wed 02 Mar 2016 06:38:07 PM CST - Tue 31 May 2016 08:00:00 AM CST
-tls_fingerprint     9A:55:E3:4C:C1:B1:43:3A:24:B0:FF:9A:3F:BF:7A:8B:14:F6:52:A0
+#tls_fingerprint     9A:55:E3:4C:C1:B1:43:3A:24:B0:FF:9A:3F:BF:7A:8B:14:F6:52:A0
 from                liweitianux@gmail.com
 user                liweitianux@gmail.com
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/gmail-li.gpg"
@@ -56,7 +56,7 @@ account             outlook-aly
 host                smtp-mail.outlook.com
 # Fingerprint of a single certificate to accept for TLS
 # Validity: Wed 16 Dec 2015 06:26:11 AM CST - Fri 16 Dec 2016 06:26:11 AM CST
-tls_fingerprint     C9:14:DD:96:6D:BD:09:12:C3:6E:C2:94:F8:3D:8D:3B:5A:43:47:29
+#tls_fingerprint     C9:14:DD:96:6D:BD:09:12:C3:6E:C2:94:F8:3D:8D:3B:5A:43:47:29
 from                aaronly.me@outlook.com
 user                aaronly.me@outlook.com
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/outlook-aly.gpg"
@@ -66,7 +66,7 @@ passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.pri
 account             outlook-li
 host                smtp-mail.outlook.com
 # Validity: Wed 16 Dec 2015 06:26:11 AM CST - Fri 16 Dec 2016 06:26:11 AM CST
-tls_fingerprint     C9:14:DD:96:6D:BD:09:12:C3:6E:C2:94:F8:3D:8D:3B:5A:43:47:29
+#tls_fingerprint     C9:14:DD:96:6D:BD:09:12:C3:6E:C2:94:F8:3D:8D:3B:5A:43:47:29
 from                liweitianux@live.com
 user                liweitianux@live.com
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/outlook-li.gpg"
@@ -76,7 +76,7 @@ passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.pri
 account             sjtu
 host                smtp.sjtu.edu.cn
 # Validity: Thu 22 May 2014 08:46:47 AM CST - Thu 06 Apr 2017 02:54:22 PM CST
-tls_fingerprint     B1:EC:0B:44:E7:AE:FB:98:3E:01:DB:C3:C7:43:2B:3A:AE:49:10:FE
+#tls_fingerprint     B1:EC:0B:44:E7:AE:FB:98:3E:01:DB:C3:C7:43:2B:3A:AE:49:10:FE
 from                liweitianux@sjtu.edu.cn
 user                liweitianux@sjtu.edu.cn
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/sjtu.gpg"
@@ -87,7 +87,7 @@ account             autistici
 host                smtp.autistici.org
 #tls_trust_file      ~/.private/ca-autistici.crt
 # Validity: Sat 23 May 2015 05:57:46 PM CST - Mon 22 May 2017 05:57:46 PM CST
-tls_fingerprint     D2:85:4A:D7:33:88:48:E5:9B:6A:55:A9:06:3C:ED:76:88:88:69:6F
+#tls_fingerprint     D2:85:4A:D7:33:88:48:E5:9B:6A:55:A9:06:3C:ED:76:88:88:69:6F
 from                liweitianux@autistici.org
 user                liweitianux@autistici.org
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/autistici.gpg"
@@ -97,7 +97,7 @@ passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.pri
 account             foxmail
 host                smtp.qq.com
 # Validity: Wed 27 Jan 2016 08:00:00 AM CST - Mon 24 Oct 2016 07:59:59 AM CST
-tls_fingerprint     7A:84:56:68:B9:72:88:AD:8D:26:53:72:F6:E6:E0:41:C7:3E:8D:1E
+#tls_fingerprint     7A:84:56:68:B9:72:88:AD:8D:26:53:72:F6:E6:E0:41:C7:3E:8D:1E
 from                liweitianux@foxmail.com
 user                liweitianux@foxmail.com
 passwordeval        "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.private/foxmail.gpg"
diff --git a/_offlineimaprc b/_offlineimaprc
index ca72950..9055b71 100644
--- a/_offlineimaprc
+++ b/_offlineimaprc
@@ -136,7 +136,7 @@ auth_mechanisms     = GSSAPI, CRAM-MD5, PLAIN, LOGIN
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: Mar  2 11:00:00 2016 GMT - May 31 00:00:00 2016 GMT
-cert_fingerprint    = c1a3bb1a8617af4a28ee2e0cd494533c3cd70bf8
+#cert_fingerprint    = c1a3bb1a8617af4a28ee2e0cd494533c3cd70bf8
 keepalive           = 60
 holdconnectionopen  = yes
 # Filter the IMAP folders to be sync'ed
@@ -201,7 +201,7 @@ auth_mechanisms     = GSSAPI, CRAM-MD5, PLAIN, LOGIN
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: Mar  2 11:00:00 2016 GMT - May 31 00:00:00 2016 GMT
-cert_fingerprint    = c1a3bb1a8617af4a28ee2e0cd494533c3cd70bf8
+#cert_fingerprint    = c1a3bb1a8617af4a28ee2e0cd494533c3cd70bf8
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [
@@ -250,7 +250,7 @@ auth_mechanisms     = GSSAPI, CRAM-MD5, PLAIN, LOGIN
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: Dec 15 22:26:11 2015 GMT - Dec 15 22:26:11 2016 GMT
-cert_fingerprint    = c914dd966dbd0912c36ec294f83d8d3b5a434729
+#cert_fingerprint    = c914dd966dbd0912c36ec294f83d8d3b5a434729
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [
@@ -298,7 +298,7 @@ auth_mechanisms     = GSSAPI, CRAM-MD5, PLAIN, LOGIN
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: Dec 15 22:26:11 2015 GMT - Dec 15 22:26:11 2016 GMT
-cert_fingerprint    = c914dd966dbd0912c36ec294f83d8d3b5a434729
+#cert_fingerprint    = c914dd966dbd0912c36ec294f83d8d3b5a434729
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [
@@ -345,7 +345,7 @@ remotepasseval      = mailpasswd("sjtu")
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: May 22 00:46:47 2014 GMT - Apr  6 06:54:22 2017 GMT
-cert_fingerprint    = b1ec0b44e7aefb983e01dbc3c7432b3aae4910fe
+#cert_fingerprint    = b1ec0b44e7aefb983e01dbc3c7432b3aae4910fe
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [
@@ -392,7 +392,7 @@ remotepasseval      = mailpasswd("autistici")
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-autistici.crt
 # Validity: May 23 09:56:37 2015 GMT - May 22 09:56:37 2017 GMT
-cert_fingerprint    = d59db2e0a7a8a0081d3111d3aaf51ccc7a3f20e2
+#cert_fingerprint    = d59db2e0a7a8a0081d3111d3aaf51ccc7a3f20e2
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [
@@ -439,7 +439,7 @@ remotepasseval      = mailpasswd("foxmail")
 ssl                 = yes
 sslcacertfile       = ~/.private/ca-certificates.crt
 # Validity: Jan 27 00:00:00 2016 GMT - Oct 23 23:59:59 2016 GMT
-cert_fingerprint    = 7a845668b97288ad8d265372f6e6e041c73e8d1e
+#cert_fingerprint    = 7a845668b97288ad8d265372f6e6e041c73e8d1e
 keepalive           = 60
 holdconnectionopen  = yes
 folderfilter        = lambda folder: folder in [