From 388ff777207ba7828227789f37eee5a5b033c445 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Mon, 16 May 2005 07:25:35 +0000
Subject: [PATCH] updates

---
 includes/account_stuff.php | 2 +-
 pages/account/18.php       | 4 ++--
 scripts/clientcerts.php    | 4 ++++
 scripts/servercerts.php    | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 8228fab..74008b6 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -230,7 +230,7 @@ function hideall() {
     </div>
   <div id="siteInfo"><a href="account.php?id=37"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> |
 	<a href="account.php?id=39"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a>
-		| &copy;2004 by CAcert</div>
+		| &copy;2002-2005 by CAcert</div>
 </div>  
 </body>             
 </html><?
diff --git a/pages/account/18.php b/pages/account/18.php
index 1f07ee1..990d610 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -61,7 +61,7 @@
 <? if($verified == _("Valid")) { ?>
     <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td>
     <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=6&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
+    <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
 <? } else if($verified == _("Pending")) { ?>
     <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td>
     <td class="DataTD"><?=$verified?></td>
@@ -69,7 +69,7 @@
 <? } else { ?>
     <td class="DataTD">&nbsp;</td>
     <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=6&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
+    <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
 <? } ?>
     <td class="DataTD"><?=$row['revoke']?></td>
     <td class="DataTD"><?=$row['expires']?></td>
diff --git a/scripts/clientcerts.php b/scripts/clientcerts.php
index 3129192..e50a273 100755
--- a/scripts/clientcerts.php
+++ b/scripts/clientcerts.php
@@ -162,11 +162,15 @@
 	while($row = mysql_fetch_assoc($res))
 	{
 		$row['crt_name'] = "../crt/orgclient-".$row['id'].".crt";
+//		if($row['orgid'] == 1)
+//			$opensslcnf = "/etc/ssl/openssl-ocsp.cnf"; else
 		if($row['codesign'] == 0)
 			$opensslcnf = "/etc/ssl/openssl-client.cnf";
 		else
 			$opensslcnf = "/etc/ssl/openssl-client-codesign.cnf";
 		$days = 365;
+//		echo "/usr/bin/openssl ca -config $opensslcnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch\n";
+//		echo "/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text\n";die;
 		$do = `/usr/bin/openssl ca -config $opensslcnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
 		$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
 		if(filesize($row[crt_name]) > 0)
diff --git a/scripts/servercerts.php b/scripts/servercerts.php
index 767e3bb..aaa8f86 100755
--- a/scripts/servercerts.php
+++ b/scripts/servercerts.php
@@ -56,6 +56,7 @@
 		fputs($fp, "basicConstraints = critical, CA:FALSE\n");
 		fputs($fp, "extendedKeyUsage = clientAuth, serverAuth, nsSGC, msSGC\n");
 		fputs($fp, "keyUsage = digitalSignature, keyEncipherment\n");
+		fputs($fp, "authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org:2560\n");
 		$bits = explode("/", $row['subject']);
 		foreach($bits as $val)
 		{
@@ -152,6 +153,7 @@
 		fputs($fp, "basicConstraints = critical, CA:FALSE\n");
 		fputs($fp, "extendedKeyUsage = clientAuth, serverAuth, nsSGC, msSGC\n");
 		fputs($fp, "keyUsage = digitalSignature, keyEncipherment\n");
+		fputs($fp, "authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org:2560\n");
 		$bits = explode("/", $row['subject']);
 		foreach($bits as $val)
 		{