3 files changed, 18 insertions, 4 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index d2683135..9591885a 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -17,6 +17,7 @@ void init_GmResponse(iGmResponse *d) {
     init_Block(&d->body, 0);
     d->certFlags = 0;
     iZap(d->certValidUntil);
+    init_String(&d->certSubject);
 }
 
 void initCopy_GmResponse(iGmResponse *d, const iGmResponse *other) {
@@ -25,9 +26,11 @@ void initCopy_GmResponse(iGmResponse *d, const iGmResponse *other) {
     initCopy_Block(&d->body, &other->body);
     d->certFlags = other->certFlags;
     d->certValidUntil = other->certValidUntil;
+    initCopy_String(&d->certSubject, &other->certSubject);
 }
 
 void deinit_GmResponse(iGmResponse *d) {
+    deinit_String(&d->certSubject);
     deinit_Block(&d->body);
     deinit_String(&d->meta);
 }
@@ -38,6 +41,7 @@ void clear_GmResponse(iGmResponse *d) {
     clear_Block(&d->body);
     d->certFlags = 0;
     iZap(d->certValidUntil);
+    clear_String(&d->certSubject);
 }
 
 iGmResponse *copy_GmResponse(const iGmResponse *d) {
@@ -117,7 +121,7 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
 
 static uint32_t timedOutWhileReceivingBody_GmRequest_(uint32_t interval, void *obj) {
     iGmRequest *d = obj;
-    iGuardMutex(&d->mutex, cancel_TlsRequest(d->req));
+    cancel_TlsRequest(d->req);
     iUnused(interval);
     return 0;
 }
@@ -146,7 +150,8 @@ static void checkServerCertificate_GmRequest_(iGmRequest *d) {
         if (checkTrust_GmCerts(certDb, domain, cert)) {
             d->resp.certFlags |= trusted_GmCertFlag;
         }
-        validUntil_TlsCertificate(serverCertificate_TlsRequest(d->req), &d->resp.certValidUntil);
+        validUntil_TlsCertificate(cert, &d->resp.certValidUntil);
+        set_String(&d->resp.certSubject, collect_String(subject_TlsCertificate(cert)));
     }
 }
 
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 047edd69..c7d9d738 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -20,6 +20,7 @@ struct Impl_GmResponse {
     iBlock             body;
     int                certFlags;
     iDate              certValidUntil;
+    iString            certSubject;
 };
 
 iDeclareTypeConstruction(GmResponse)
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7ae43458..9c8c93c6 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -87,6 +87,7 @@ struct Impl_DocumentWidget {
     iGmDocument *doc;
     int certFlags;
     iDate certExpiry;
+    iString *certSubject;
     iBool selecting;
     iRangecc selectMark;
     iRangecc foundMark;
@@ -121,6 +122,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->textSizePercent  = 100;
     d->doc              = new_GmDocument();
     d->certFlags        = 0;
+    d->certSubject      = new_String();
     d->selecting        = iFalse;
     d->selectMark       = iNullRange;
     d->foundMark        = iNullRange;
@@ -151,6 +153,7 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     iRelease(d->doc);
     deinit_PtrArray(&d->visibleLinks);
     delete_String(d->url);
+    delete_String(d->certSubject);
     delete_String(d->titleUser);
     SDL_FreeCursor(d->arrowCursor);
     SDL_FreeCursor(d->beamCursor);
@@ -411,6 +414,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
 #define closedLock_CStr "\U0001f512"
     d->certFlags       = response->certFlags;
     d->certExpiry      = response->certValidUntil;
+    set_String(d->certSubject, &response->certSubject);
     iLabelWidget *lock = findWidget_App("navbar.lock");
     if (~d->certFlags & available_GmCertFlag) {
         setFlags_Widget(as_Widget(lock), disabled_WidgetFlag, iTrue);
@@ -710,12 +714,15 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         const char *checked   = green_ColorEscape "\u2611";
         makeMessage_Widget(
             cyan_ColorEscape "CERTIFICATE STATUS",
-            format_CStr("%s%s  Domain name %s\n"
+            format_CStr("%s%s  Domain name %s%s\n"
                         "%s%s  %s (%04d-%02d-%02d %02d:%02d:%02d)\n"
                         "%s%s  %s",
                         d->certFlags & domainVerified_GmCertFlag ? checked : unchecked,
                         gray75_ColorEscape,
                         d->certFlags & domainVerified_GmCertFlag ? "matches" : "mismatch",
+                        ~d->certFlags & domainVerified_GmCertFlag
+                            ? format_CStr(" (%s)", cstr_String(d->certSubject))
+                            : "",
                         d->certFlags & timeVerified_GmCertFlag ? checked : unchecked,
                         gray75_ColorEscape,
                         d->certFlags & timeVerified_GmCertFlag ? "Not expired" : "Expired",
@@ -727,7 +734,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                         d->certExpiry.second,
                         d->certFlags & trusted_GmCertFlag ? checked : unchecked,
                         gray75_ColorEscape,
-                        d->certFlags & trusted_GmCertFlag ? "Trusted on first use" : "Not trusted"));
+                        d->certFlags & trusted_GmCertFlag ? "Trusted on first use"
+                                                          : "Not trusted"));
         return iTrue;
     }
     else if (equal_Command(cmd, "copy")) {