summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-01-14 23:46:53 +0100
committerMichael Tänzer <neo@nhng.de>2014-01-14 23:46:53 +0100
commit7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467 (patch)
tree133d6e13173e7ce5de1746ebf54bbefd14b1275b
parenta3470bf19516ac42a805315fa670164ea0ddbbc7 (diff)
parent5decb5e88224831cc6e8c5372f8eafc04cfbe23c (diff)
downloadcacert-devel-7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467.tar.gz
cacert-devel-7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467.tar.xz
cacert-devel-7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467.zip
Merge remote-tracking branch 'origin/bug-1237' into release
-rwxr-xr-xCommModule/client.pl11
1 files changed, 9 insertions, 2 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index bf92b27..bd3eb02 100755
--- a/CommModule/client.pl
+++ b/CommModule/client.pl
@@ -834,8 +834,15 @@ sub HandleCerts($$)
my $days=$org?($server?(365*2):365):calculateDays($row{"memid"});
-
- $crt=Request($ver,1,1,$row{'rootcert'}-1,$profile,$row{'md'}eq"sha1"?2:0,$days,$row{'keytype'}eq"NS"?1:0,$content,$SAN,$subject);
+ my $md_id = 0;
+ $md_id = 1 if( $row{'md'} eq "md5");
+ $md_id = 2 if( $row{'md'} eq "sha1");
+ $md_id = 3 if( $row{'md'} eq "rmd160");
+ $md_id = 8 if( $row{'md'} eq "sha256");
+ $md_id = 9 if( $row{'md'} eq "sha384");
+ $md_id =10 if( $row{'md'} eq "sha512");
+
+ $crt=Request($ver,1,1,$row{'rootcert'}-1,$profile,$md_id,$days,$row{'keytype'}eq"NS"?1:0,$content,$SAN,$subject);
if(length($crt))
{
if($crt=~m/^-----BEGIN CERTIFICATE-----/)