Attachment #406668 for bug #540622

Lines 1062-1067 Link Here

(-)a/usr/share/tinyca/lib/CA.pm (+1 lines)
1062	'outdir' => $self->{$ca}->{'dir'}."/newcerts/",	1062	'outdir' => $self->{$ca}->{'dir'}."/newcerts/",
1063	'keyfile' => $self->{$ca}->{'dir'}."/cacert.key",	1063	'keyfile' => $self->{$ca}->{'dir'}."/cacert.key",
1064	'cacertfile' => $self->{$ca}->{'dir'}."/cacert.pem",	1064	'cacertfile' => $self->{$ca}->{'dir'}."/cacert.pem",
		1065	'digest' => $opts->{'digest'},
1065	'pass' => $opts->{'passwd'},	1066	'pass' => $opts->{'passwd'},
1066	'days' => $opts->{'days'},	1067	'days' => $opts->{'days'},
1067	'parentpw' => $opts->{'parentpw'},	1068	'parentpw' => $opts->{'parentpw'},

Lines 479-485 Link Here

(-)a/usr/share/tinyca/lib/CERT.pm (-1 / +4 lines)
479	if($opts->{'incfp'}) {	479	if($opts->{'incfp'}) {
480	$out = '';	480	$out = '';
481	$out .= "Fingerprint (MD5): $opts->{'parsed'}->{'FINGERPRINTMD5'}\n";	481	$out .= "Fingerprint (MD5): $opts->{'parsed'}->{'FINGERPRINTMD5'}\n";
482	$out .= "Fingerprint (SHA1): $opts->{'parsed'}->{'FINGERPRINTSHA1'}\n\n";	482	$out .= "Fingerprint (SHA1): $opts->{'parsed'}->{'FINGERPRINTSHA1'}\n";
		483	$out .= "Fingerprint (SHA256): $opts->{'parsed'}->{'FINGERPRINTSHA256'}\n";
		484	$out .= "Fingerprint (SHA384): $opts->{'parsed'}->{'FINGERPRINTSHA384'}\n";
		485	$out .= "Fingerprint (SHA512): $opts->{'parsed'}->{'FINGERPRINTSHA512'}\n\n";
483	} else {	486	} else {
484	$out = '';	487	$out = '';
485	}	488	}

Lines 70-75 Link Here

(-)a/usr/share/tinyca/lib/GUI/WORDS.pm (+3 lines)
70	'STATUS' => _("Status"),	70	'STATUS' => _("Status"),
71	'FINGERPRINTMD5' => _("Fingerprint (MD5)"),	71	'FINGERPRINTMD5' => _("Fingerprint (MD5)"),
72	'FINGERPRINTSHA1' => _("Fingerprint (SHA1)"),	72	'FINGERPRINTSHA1' => _("Fingerprint (SHA1)"),
		73	'FINGERPRINTSHA256' => _("Fingerprint (SHA256)"),
		74	'FINGERPRINTSHA384' => _("Fingerprint (SHA384)"),
		75	'FINGERPRINTSHA512' => _("Fingerprint (SHA512)"),
73	_("Not set") => 'none',	76	_("Not set") => 'none',
74	_("Ask User") => 'user',	77	_("Ask User") => 'user',
75	_("critical") => 'critical',	78	_("critical") => 'critical',

Lines 37-42 Link Here

(-)a/usr/share/tinyca/lib/GUI.pm (-3 / +6 lines)
37	'ripemd160' => 'RIPEMD-160',	37	'ripemd160' => 'RIPEMD-160',
38	# 'sha' => 'SHA',	38	# 'sha' => 'SHA',
39	'sha1' => 'SHA-1',	39	'sha1' => 'SHA-1',
		40	'sha256' => 'SHA-256',
		41	'sha384' => 'SHA-384',
		42	'sha512' => 'SHA-512',
40	);	43	);
41		44
42	my %bit_lengths = (	45	my %bit_lengths = (
Lines 1060-1066 Link Here
1060	$piter = $store->append($root);	1063	$piter = $store->append($root);
1061	$store->set($piter, 0 => $t);	1064	$store->set($piter, 0 => $t);
1062		1065
1063	for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1)) {	1066	for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1 FINGERPRINTSHA256 FINGERPRINTSHA384 FINGERPRINTSHA512)) {
1064	if(defined($parsed->{$l})) {	1067	if(defined($parsed->{$l})) {
1065	$citer = $store->append($piter);	1068	$citer = $store->append($piter);
1066	$store->set($citer,	1069	$store->set($citer,
Lines 3091-3102 Link Here
3091	my($previous_key, $value);	3094	my($previous_key, $value);
3092		3095
3093	$previous_key = undef;	3096	$previous_key = undef;
3094	for $value (keys %values) {	3097	for $value (sort keys %values) {
3095	my $display_name = $values{$value};	3098	my $display_name = $values{$value};
3096	my $key = Gtk2::RadioButton->new($previous_key, $display_name);	3099	my $key = Gtk2::RadioButton->new($previous_key, $display_name);
3097	$key->set_active(1) if(defined($$var) && $$var eq $value);
3098	$key->signal_connect('toggled' =>	3100	$key->signal_connect('toggled' =>
3099	sub{GUI::CALLBACK::toggle_to_var($key, $var, $value)});	3101	sub{GUI::CALLBACK::toggle_to_var($key, $var, $value)});
		3102	$key->set_active(1) if(defined($$var) && $$var eq $value);
3100	$radiobox->add($key);	3103	$radiobox->add($key);
3101	$previous_key = $key;	3104	$previous_key = $key;
3102	}	3105	}




   }
   waitpid($pid, 0);
   $ret = $? >> 8;
   
   $cmd = "$self->{'bin'} x509 -noout -fingerprint -sha256 -in $file";
   $ext = "$cmd\n\n";
   $pid = open3($wtfh, $rdfh, $rdfh, $cmd);
   while(<$rdfh>){
      $ext .= $_;
      ($k, $v) = split(/=/);
      $tmp->{'FINGERPRINTSHA256'} = $v if($k =~ /SHA256 Fingerprint/i);
      chomp($tmp->{'FINGERPRINTSHA256'});
   }
   waitpid($pid, 0);
   $ret = $? >> 8;

   $cmd = "$self->{'bin'} x509 -noout -fingerprint -sha384 -in $file";
   $ext = "$cmd\n\n";
   $pid = open3($wtfh, $rdfh, $rdfh, $cmd);
   while(<$rdfh>){
      $ext .= $_;
      ($k, $v) = split(/=/);
      $tmp->{'FINGERPRINTSHA384'} = $v if($k =~ /SHA384 Fingerprint/i);
      chomp($tmp->{'FINGERPRINTSHA384'});
   }
   waitpid($pid, 0);
   $ret = $? >> 8;

   $cmd = "$self->{'bin'} x509 -noout -fingerprint -sha512 -in $file";
   $ext = "$cmd\n\n";
   $pid = open3($wtfh, $rdfh, $rdfh, $cmd);
   while(<$rdfh>){
      $ext .= $_;
      ($k, $v) = split(/=/);
      $tmp->{'FINGERPRINTSHA512'} = $v if($k =~ /SHA512 Fingerprint/i);
      chomp($tmp->{'FINGERPRINTSHA512'});
   }
   waitpid($pid, 0);
   $ret = $? >> 8;

   if($ret) {
      $t = _("Error reading fingerprint from Certificate");

Lines 426-431 Link Here

(-)a/usr/share/tinyca/lib/REQ.pm (+6 lines)
426	$opts->{'digest'} = "md5";	426	$opts->{'digest'} = "md5";
427	} elsif ($opts->{'digest'} =~ /^sha1/) {	427	} elsif ($opts->{'digest'} =~ /^sha1/) {
428	$opts->{'digest'} = "sha1";	428	$opts->{'digest'} = "sha1";
		429	} elsif ($opts->{'digest'} =~ /^sha256/) {
		430	$opts->{'digest'} = "sha256";
		431	} elsif ($opts->{'digest'} =~ /^sha384/) {
		432	$opts->{'digest'} = "sha384";
		433	} elsif ($opts->{'digest'} =~ /^sha512/) {
		434	$opts->{'digest'} = "sha512";
429	} elsif ($opts->{'digest'} =~ /^ripemd160/) {	435	} elsif ($opts->{'digest'} =~ /^ripemd160/) {
430	$opts->{'digest'} = "ripemd160";	436	$opts->{'digest'} = "ripemd160";
431	} else {	437	} else {

Return to bug 540622

Lines 669-674 Link Here

(-)a/usr/share/tinyca/lib/OpenSSL.pm (+36 lines)
669	}	669	}
670	waitpid($pid, 0);	670	waitpid($pid, 0);
671	$ret = $? >> 8;	671	$ret = $? >> 8;
		672
		673	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha256 -in $file";
		674	$ext = "$cmd\n\n";
		675	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		676	while(<$rdfh>){
		677	$ext .= $_;
		678	($k, $v) = split(/=/);
		679	$tmp->{'FINGERPRINTSHA256'} = $v if($k =~ /SHA256 Fingerprint/i);
		680	chomp($tmp->{'FINGERPRINTSHA256'});
		681	}
		682	waitpid($pid, 0);
		683	$ret = $? >> 8;
		684
		685	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha384 -in $file";
		686	$ext = "$cmd\n\n";
		687	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		688	while(<$rdfh>){
		689	$ext .= $_;
		690	($k, $v) = split(/=/);
		691	$tmp->{'FINGERPRINTSHA384'} = $v if($k =~ /SHA384 Fingerprint/i);
		692	chomp($tmp->{'FINGERPRINTSHA384'});
		693	}
		694	waitpid($pid, 0);
		695	$ret = $? >> 8;
		696
		697	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha512 -in $file";
		698	$ext = "$cmd\n\n";
		699	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		700	while(<$rdfh>){
		701	$ext .= $_;
		702	($k, $v) = split(/=/);
		703	$tmp->{'FINGERPRINTSHA512'} = $v if($k =~ /SHA512 Fingerprint/i);
		704	chomp($tmp->{'FINGERPRINTSHA512'});
		705	}
		706	waitpid($pid, 0);
		707	$ret = $? >> 8;
672		708
673	if($ret) {	709	if($ret) {
674	$t = _("Error reading fingerprint from Certificate");	710	$t = _("Error reading fingerprint from Certificate");