2 files changed, 36 insertions, 22 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index 0aa084a4..11e9ce2c 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -1,6 +1,7 @@
 #include "gmcerts.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/mutex.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/regexp.h>
 #include <the_Foundation/stringhash.h>
@@ -32,6 +33,7 @@ iDefineClass(TrustEntry)
 /*-----------------------------------------------------------------------------------------------*/
 
 struct Impl_GmCerts {
+    iMutex mtx;
     iString saveDir;
     iStringHash *trusted;
 };
@@ -87,14 +89,18 @@ static void load_GmCerts_(iGmCerts *d) {
 }
 
 void init_GmCerts(iGmCerts *d, const char *saveDir) {
+    init_Mutex(&d->mtx);
     initCStr_String(&d->saveDir, saveDir);
     d->trusted = new_StringHash();
     load_GmCerts_(d);
 }
 
-void deinit_GmCerts(iGmCerts *d) {    
-    iRelease(d->trusted);
-    deinit_String(&d->saveDir);
+void deinit_GmCerts(iGmCerts *d) {
+    iGuardMutex(&d->mtx, {
+        iRelease(d->trusted);
+        deinit_String(&d->saveDir);
+    });
+    deinit_Mutex(&d->mtx);
 }
 
 iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *cert) {
@@ -112,6 +118,7 @@ iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *ce
     iDate until;
     validUntil_TlsCertificate(cert, &until);
     iBlock *fingerprint = collect_Block(fingerprint_TlsCertificate(cert));
+    lock_Mutex(&d->mtx);
     iTrustEntry *trust = value_StringHash(d->trusted, key);
     if (trust) {
         /* We already have it, check if it matches the one we trust for this domain (if it's
@@ -120,7 +127,9 @@ iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *ce
         initCurrent_Time(&now);
         if (secondsSince_Time(&trust->validUntil, &now) > 0) {
             /* Trusted cert is still valid. */
-            return cmp_Block(fingerprint, &trust->fingerprint) == 0;
+            const iBool isTrusted = cmp_Block(fingerprint, &trust->fingerprint) == 0;
+            unlock_Mutex(&d->mtx);
+            return isTrusted;
         }
         /* Update the trusted cert. */
         init_Time(&trust->validUntil, &until);
@@ -130,5 +139,6 @@ iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *ce
         insert_StringHash(d->trusted, key, iClob(new_TrustEntry(fingerprint, &until)));
     }
     save_GmCerts_(d);
+    unlock_Mutex(&d->mtx);
     return iTrue;
 }
diff --git a/src/gmrequest.c b/src/gmrequest.c
index dc08d23b..c0697f49 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -98,6 +98,25 @@ static void restartTimeout_GmRequest_(iGmRequest *d) {
     d->timeoutId = SDL_AddTimer(BODY_TIMEOUT, timedOutWhileReceivingBody_GmRequest_, d);
 }
 
+static void checkServerCertificate_GmRequest_(iGmRequest *d) {
+    const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
+    d->certFlags = 0;
+    if (cert) {
+        iGmCerts *     certDb = certs_App();
+        const iRangecc domain = urlHost_String(&d->url);
+        d->certFlags |= available_GmRequestCertFlag;
+        if (!isExpired_TlsCertificate(cert)) {
+            d->certFlags |= timeVerified_GmRequestCertFlag;
+        }
+        if (verifyDomain_TlsCertificate(cert, domain)) {
+            d->certFlags |= domainVerified_GmRequestCertFlag;
+        }
+        if (checkTrust_GmCerts(certDb, domain, cert)) {
+            d->certFlags |= trusted_GmRequestCertFlag;
+        }
+    }
+}
+
 static void readIncoming_GmRequest_(iAnyObject *obj) {
     iGmRequest *d = (iGmRequest *) obj;
     iBool notifyUpdate = iFalse;
@@ -136,6 +155,7 @@ static void readIncoming_GmRequest_(iAnyObject *obj) {
             }
             d->code = code;
             d->state = receivingBody_GmRequestState;
+            checkServerCertificate_GmRequest_(d);
             notifyUpdate = iTrue;
             /* Start a timeout for the remainder of the response, in case the connection
                remains open. */
@@ -168,23 +188,7 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
     SDL_RemoveTimer(d->timeoutId);
     d->timeoutId = 0;
     d->state     = finished_GmRequestState;
-    d->certFlags = 0;
-    /* Check the server certificate. */ {
-        const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
-        if (cert) {
-            iGmCerts *     certDb = certs_App();
-            const iRangecc domain = urlHost_String(&d->url);
-            d->certFlags |= available_GmRequestCertFlag;
-            if (!isExpired_TlsCertificate(cert)) {
-                d->certFlags |= timeVerified_GmRequestCertFlag;
-            }
-            if (verifyDomain_TlsCertificate(cert, domain)) {
-                d->certFlags |= domainVerified_GmRequestCertFlag;
-            }
-            if (checkTrust_GmCerts(certDb, domain, cert)) {
-                d->certFlags |= trusted_GmRequestCertFlag;
-            }
-        }
+    checkServerCertificate_GmRequest_(d);
 #if 0
         printf("Server certificate:\n%s\n", cstrLocal_String(pem_TlsCertificate(cert)));
         iBlock *sha = fingerprint_TlsCertificate(cert);
@@ -205,7 +209,6 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
         }
         fflush(stdout);
 #endif
-    }
     unlock_Mutex(&d->mutex);
     iNotifyAudience(d, finished, GmRequestFinished);
 }
@@ -218,6 +221,7 @@ void submit_GmRequest(iGmRequest *d) {
     d->code = none_GmStatusCode;
     clear_String(&d->header);
     clear_Block(&d->body);
+    d->certFlags = 0;
     iUrl url;
     init_Url(&url, &d->url);
     if (equalCase_Rangecc(&url.protocol, "file")) {