Creating identity containing a domain

4 files changed, 16 insertions, 10 deletions

diff --git a/src/app.c b/src/app.c
index fe450c51..78aae9a9 100644
--- a/src/app.c
+++ b/src/app.c
@@ -570,6 +570,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
         if (equal_Command(cmd, "ident.accept")) {
             const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
             const iString *userId       = text_InputWidget (findChild_Widget(dlg, "ident.userid"));
+            const iString *domain       = text_InputWidget (findChild_Widget(dlg, "ident.domain"));
             const iString *organization = text_InputWidget (findChild_Widget(dlg, "ident.org"));
             const iString *country      = text_InputWidget (findChild_Widget(dlg, "ident.country"));
             const iBool    isTemp       = isSelected_Widget(findChild_Widget(dlg, "ident.temp"));
@@ -591,9 +592,9 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                 if (n <= 0 || val[0] < (unsigned) today.year) {
                     makeMessage_Widget(orange_ColorEscape "INVALID DATE",
                                        "Please check the \"Valid until\" date. Examples:\n"
-                                       "2030\n"
-                                       "2025-06-30\n"
-                                       "2021-12-31 23:59:59");
+                                       "\u2022 2030\n"
+                                       "\u2022 2025-06-30\n"
+                                       "\u2022 2021-12-31 23:59:59");
                     return iTrue;
                 }
                 until.year   = val[0];
@@ -615,7 +616,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
             }
             /* The input seems fine. */
             newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
-                                until, commonName, userId, organization, country);
+                                until, commonName, userId, domain, organization, country);
             postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
             postCommand_App("idents.changed");
         }
diff --git a/src/gmcerts.c b/src/gmcerts.c
index cffa744f..923987b1 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -404,12 +404,14 @@ const iGmIdentity *identityForUrl_GmCerts(const iGmCerts *d, const iString *url)
 }
 
 iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const iString *commonName,
-                                 const iString *userId, const iString *org,
+                                 const iString *userId, const iString *domain, const iString *org,
                                  const iString *country) {
     const iTlsCertificateName names[] = {
-        { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("fi.skyjake.Lagrange") },
+        { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("Lagrange v" LAGRANGE_APP_VERSION) },
+        { issuerDomain_TlsCertificateNameType,        collectNewCStr_String("lagrange.skyjake.fi") },
         { subjectCommonName_TlsCertificateNameType,   commonName },
         { subjectUserId_TlsCertificateNameType,       !isEmpty_String(userId) ? userId : NULL },
+        { subjectDomain_TlsCertificateNameType,       !isEmpty_String(domain) ? domain : NULL },
         { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org) ? org : NULL },
         { subjectCountry_TlsCertificateNameType,      !isEmpty_String(country) ? country : NULL },
         { 0, NULL }
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 1730ca8e..04904d51 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -71,6 +71,7 @@ const iGmIdentity * identityForUrl_GmCerts  (const iGmCerts *, const iString *ur
  */
 iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validUntil,
                                              const iString *commonName, const iString *userId,
-                                             const iString *org, const iString *country);
+                                             const iString *domain, const iString *org,
+                                             const iString *country);
 
 const iPtrArray *   identities_GmCerts      (const iGmCerts *);
diff --git a/src/ui/util.c b/src/ui/util.c
index e6067ab9..770071a6 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -854,15 +854,17 @@ iWidget *makeIdentityCreation_Widget(void) {
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-    iInputWidget *inputs[4];
+    iInputWidget *inputs[5];
     addChild_Widget(headings, iClob(makeHeading_Widget("Common name:")));
     setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "ident.common");
     addChild_Widget(headings, iClob(makeHeading_Widget("User ID:")));
     setId_Widget(addChild_Widget(values, iClob(inputs[1] = newHint_InputWidget(0, "optional"))), "ident.userid");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Domain:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[2] = newHint_InputWidget(0, "optional"))), "ident.domain");
     addChild_Widget(headings, iClob(makeHeading_Widget("Organization:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[2] = newHint_InputWidget(0, "optional"))), "ident.org");
+    setId_Widget(addChild_Widget(values, iClob(inputs[3] = newHint_InputWidget(0, "optional"))), "ident.org");
     addChild_Widget(headings, iClob(makeHeading_Widget("Country:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[3] = newHint_InputWidget(0, "optional"))), "ident.country");
+    setId_Widget(addChild_Widget(values, iClob(inputs[4] = newHint_InputWidget(0, "optional"))), "ident.country");
     addChild_Widget(headings, iClob(makeHeading_Widget("Valid until:")));
     setId_Widget(addChild_Widget(values, iClob(newHint_InputWidget(19, "YYYY-MM-DD HH:MM:SS"))), "ident.until");
     addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));