From 23a5593ea946b3d3a5306d0ae18aafcedcbf523e Mon Sep 17 00:00:00 2001
From: Brian McCullough <bmccullough@cacert.org>
Date: Sun, 6 Oct 2024 20:15:11 -0400
Subject: [PATCH 1/2] Revised commit of 3.php to limit it to the bare minimum.

The selection of Root Certicate type has been removed and only the Type 3
will be generated.
---
 pages/account/3.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index 2e04171..fcff5da 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -1,6 +1,6 @@
 <? /*
     LibreSSL - CAcert web application
-    Copyright (C) 2004-2008  CAcert Inc.
+    Copyright (C) 2004-2024  CAcert Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -103,9 +103,9 @@
       ?>
       <tr>
         <td class="DataTD" colspan="2" align="left">
-          <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
-          <input type="radio" id="root2" name="rootcert" value="2" checked="checked"/> <label for="root2"><?= _("Sign by class 3 root certificate") ?></label><br/>
-          <?= str_replace("\n", "<br />\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 125 ) ) ?>
+          <!-- <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br /> -->
+          <input type="hidden" id="root2" name="rootcert" value="2" checked="checked"/> <label for="root2"><?= _("Sign by class 3 root certificate") ?></label><br/>
+          <?= str_replace("\n", "<br />\n", wordwrap(_("Please note: both the class 1 and class 3 root certificates need to be imported into your email program so that your email program can build a full trust path chain."), 125 ) ) ?>
         </td>
       </tr>
 <? } ?>
-- 
2.30.2


From 4c8055c063ca41568142b0adfe8d75cf4f05b72a Mon Sep 17 00:00:00 2001
From: Brian McCullough <bmccullough@cacert.org>
Date: Tue, 22 Oct 2024 12:25:23 -0400
Subject: [PATCH 2/2] Removed commented code.

---
 pages/account/3.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index fcff5da..c6c7004 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -103,7 +103,6 @@
       ?>
       <tr>
         <td class="DataTD" colspan="2" align="left">
-          <!-- <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br /> -->
           <input type="hidden" id="root2" name="rootcert" value="2" checked="checked"/> <label for="root2"><?= _("Sign by class 3 root certificate") ?></label><br/>
           <?= str_replace("\n", "<br />\n", wordwrap(_("Please note: both the class 1 and class 3 root certificates need to be imported into your email program so that your email program can build a full trust path chain."), 125 ) ) ?>
         </td>
-- 
2.30.2