From 0f08a1c6681a872d0229ef950edc57b4630122d2 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Wed, 8 Jan 2014 01:55:59 +0100 Subject: bug 1237: Properly parse Message Digest from database --- CommModule/client.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index bf92b27..c71102c 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); + $md_id = 0; + $md_id = 1 if( $raw{'md'} eq "md5"); + $md_id = 2 if( $raw{'md'} eq "sha1"); + $md_id = 3 if( $raw{'md'} eq "rmd160"); + $md_id = 8 if( $raw{'md'} eq "sha256"); + $md_id = 9 if( $raw{'md'} eq "sha384"); + $md_id =10 if( $raw{'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-----/) -- cgit v1.2.1 From 182cdcadd5cd4cb0c4362e2ef732c2158c9bcf0f Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Wed, 8 Jan 2014 02:27:40 +0100 Subject: bug 1237: Declare variables before use --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index c71102c..6ff3b5e 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -834,7 +834,7 @@ sub HandleCerts($$) my $days=$org?($server?(365*2):365):calculateDays($row{"memid"}); - $md_id = 0; + my $md_id = 0; $md_id = 1 if( $raw{'md'} eq "md5"); $md_id = 2 if( $raw{'md'} eq "sha1"); $md_id = 3 if( $raw{'md'} eq "rmd160"); -- cgit v1.2.1 From 5decb5e88224831cc6e8c5372f8eafc04cfbe23c Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Wed, 8 Jan 2014 02:32:23 +0100 Subject: bug 1237: Fix a typo ... --- CommModule/client.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 6ff3b5e..bd3eb02 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -835,12 +835,12 @@ sub HandleCerts($$) my $days=$org?($server?(365*2):365):calculateDays($row{"memid"}); my $md_id = 0; - $md_id = 1 if( $raw{'md'} eq "md5"); - $md_id = 2 if( $raw{'md'} eq "sha1"); - $md_id = 3 if( $raw{'md'} eq "rmd160"); - $md_id = 8 if( $raw{'md'} eq "sha256"); - $md_id = 9 if( $raw{'md'} eq "sha384"); - $md_id =10 if( $raw{'md'} eq "sha512"); + $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)) -- cgit v1.2.1