summaryrefslogtreecommitdiff
path: root/CommModule
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-12-11 22:53:58 +0100
committerMichael Tänzer <neo@nhng.de>2012-12-11 22:53:58 +0100
commit854cc8de4d518923dd855352fd6b06aa0cfc189f (patch)
tree42737c8ada45c82f1f5045d132ed5055a21dd6a1 /CommModule
parentf7f8a436dc00dd1b57e295232f45027ecbfd18ee (diff)
parent46af74ccb903b92ac6de768934a3faf8d2da45ea (diff)
downloadcacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.tar.gz
cacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.tar.xz
cacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.zip
Merge branch 'release' into testserver-mods
Conflicts: www/cats/cats_import.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'CommModule')
-rwxr-xr-xCommModule/server.pl21
1 files changed, 20 insertions, 1 deletions
diff --git a/CommModule/server.pl b/CommModule/server.pl
index eb5113a..c70bc9a 100755
--- a/CommModule/server.pl
+++ b/CommModule/server.pl
@@ -502,9 +502,28 @@ sub SignX509($$$$$$$$)
{
open OUT,">$wid/extfile";
print OUT "basicConstraints = critical, CA:FALSE\n";
+ print OUT "keyUsage = critical, digitalSignature, keyEncipherment, keyAgreement\n";
print OUT "extendedKeyUsage = clientAuth, serverAuth, nsSGC, msSGC\n";
- print OUT "keyUsage = digitalSignature, keyEncipherment\n";
print OUT "authorityInfoAccess = OCSP;URI:$OCSPUrl\n";
+
+ my $CRLUrl="";
+ if($root==0)
+ {
+ $CRLUrl="http://crl.cacert.org/revoke.crl";
+ }
+ elsif($root==1)
+ {
+ $CRLUrl="http://crl.cacert.org/class3-revoke.crl";
+ }
+ elsif($root==2)
+ {
+ $CRLUrl="http://crl.cacert.org/class3s-revoke.crl";
+ }
+ else
+ {
+ $CRLUrl="http://crl.cacert.org/root${root}.crl";
+ }
+ print OUT "crlDistributionPoints = URI:${CRLUrl}\n";
print OUT "subjectAltName = $san\n" if(length($san));
close OUT;
$extfile=" -extfile $wid/extfile ";