Attachment #445088 for bug #540622

Lines 1062-1067 Link Here

(-)a/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 480-485 Link Here

(-)a/lib/CERT.pm (+3 lines)
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\n";
		483	$out .= "Fingerprint (SHA256): $opts->{'parsed'}->{'FINGERPRINTSHA256'}\n\n";
		484	$out .= "Fingerprint (SHA384): $opts->{'parsed'}->{'FINGERPRINTSHA384'}\n\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/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',




            'center', 0, 0);
      $self->{'x509textbox'}->pack_start($self->{'certfingerprintsha1'}, 
            0, 0, 0);

      if(defined($self->{'certfingerprintsha256'})) {
         $self->{'certfingerprintsha256'}->destroy();
      } 
      $self->{'certfingerprintsha256'} = GUI::HELPERS::create_label(
            _("Fingerprint (SHA256)").": ".$parsed->{'FINGERPRINTSHA256'},
            'center', 0, 0);
      $self->{'x509textbox'}->pack_start($self->{'certfingerprintsha256'}, 
            0, 0, 0);

      if(defined($self->{'certfingerprintsha384'})) {
         $self->{'certfingerprintsha1'}->destroy();
      } 
      $self->{'certfingerprintsha384'} = GUI::HELPERS::create_label(
            _("Fingerprint (SHA384)").": ".$parsed->{'FINGERPRINTSHA384'},
            'center', 0, 0);
      $self->{'x509textbox'}->pack_start($self->{'certfingerprintsha384'}, 
            0, 0, 0);

      if(defined($self->{'certfingerprintsha512'})) {
         $self->{'certfingerprintsha512'}->destroy();
      } 
      $self->{'certfingerprintsha512'} = GUI::HELPERS::create_label(
            _("Fingerprint (SHA512)").": ".$parsed->{'FINGERPRINTSHA512'},
            'center', 0, 0);
      $self->{'x509textbox'}->pack_start($self->{'certfingerprintsha512'}, 
            0, 0, 0);
   }

   if (($mode eq 'cert') || ($mode eq 'cacert')) {




		     'mdc2' => 'MDC2',
		     'md4' => 'MD4',
		     'ripemd160' => 'RIPEMD-160',
#		     'sha' => 'SHA',
		     'sha1' => 'SHA-1',
		     'sha256' => 'SHA-256',
		     'sha384' => 'SHA-384',
		     'sha512' => 'SHA-512',
		     );

my %bit_lengths = (

      $piter = $store->append($root);
      $store->set($piter, 0 => $t);
   
      for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1 FINGERPRINTSHA256 FINGERPRINTSHA384 FINGERPRINTSHA512)) {
         if(defined($parsed->{$l})) {
            $citer = $store->append($piter);
            $store->set($citer, 

   my($previous_key, $value);

   $previous_key = undef;
   for $value (sort keys %values) {
      my $display_name = $values{$value};
      my $key = Gtk2::RadioButton->new($previous_key, $display_name);
      $key->set_active(1) if(defined($$var) && $$var eq $value);
      $key->signal_connect('toggled' =>
			   sub{GUI::CALLBACK::toggle_to_var($key, $var, $value)});
      $key->set_active(1) if(defined($$var) && $$var eq $value);
      $radiobox->add($key);
      $previous_key = $key;
   }




      GUI::HELPERS::print_warning($t, $ext);
   }

   $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;

   if($ret) {
      $t = _("Error reading fingerprint from Certificate");
      GUI::HELPERS::print_warning($t, $ext);
   }

   $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;

   if($ret) {
      $t = _("Error reading fingerprint from Certificate");
      GUI::HELPERS::print_warning($t, $ext);
   }

   $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");
      GUI::HELPERS::print_warning($t, $ext);
   }

   # get subject in openssl format
   $cmd = "$self->{'bin'} x509 -noout -subject -in $file";
   $ext = "$cmd\n\n";

Lines 426-431 Link Here

(-)a/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 90-95 Link Here

(-)a/lib/GUI/X509_infobox.pm (+27 lines)
90	'center', 0, 0);	90	'center', 0, 0);
91	$self->{'x509textbox'}->pack_start($self->{'certfingerprintsha1'},	91	$self->{'x509textbox'}->pack_start($self->{'certfingerprintsha1'},
92	0, 0, 0);	92	0, 0, 0);
		93
		94	if(defined($self->{'certfingerprintsha256'})) {
		95	$self->{'certfingerprintsha256'}->destroy();
		96	}
		97	$self->{'certfingerprintsha256'} = GUI::HELPERS::create_label(
		98	_("Fingerprint (SHA256)").": ".$parsed->{'FINGERPRINTSHA256'},
		99	'center', 0, 0);
		100	$self->{'x509textbox'}->pack_start($self->{'certfingerprintsha256'},
		101	0, 0, 0);
		102
		103	if(defined($self->{'certfingerprintsha384'})) {
		104	$self->{'certfingerprintsha1'}->destroy();
		105	}
		106	$self->{'certfingerprintsha384'} = GUI::HELPERS::create_label(
		107	_("Fingerprint (SHA384)").": ".$parsed->{'FINGERPRINTSHA384'},
		108	'center', 0, 0);
		109	$self->{'x509textbox'}->pack_start($self->{'certfingerprintsha384'},
		110	0, 0, 0);
		111
		112	if(defined($self->{'certfingerprintsha512'})) {
		113	$self->{'certfingerprintsha512'}->destroy();
		114	}
		115	$self->{'certfingerprintsha512'} = GUI::HELPERS::create_label(
		116	_("Fingerprint (SHA512)").": ".$parsed->{'FINGERPRINTSHA512'},
		117	'center', 0, 0);
		118	$self->{'x509textbox'}->pack_start($self->{'certfingerprintsha512'},
		119	0, 0, 0);
93	}	120	}
94		121
95	if (($mode eq 'cert') \|\| ($mode eq 'cacert')) {	122	if (($mode eq 'cert') \|\| ($mode eq 'cacert')) {

Lines 675-680 Link Here

(-)a/lib/OpenSSL.pm (+51 lines)
675	GUI::HELPERS::print_warning($t, $ext);	675	GUI::HELPERS::print_warning($t, $ext);
676	}	676	}
677		677
		678	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha256 -in $file";
		679	$ext = "$cmd\n\n";
		680	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		681	while(<$rdfh>){
		682	$ext .= $_;
		683	($k, $v) = split(/=/);
		684	$tmp->{'FINGERPRINTSHA256'} = $v if($k =~ /SHA256 Fingerprint/i);
		685	chomp($tmp->{'FINGERPRINTSHA256'});
		686	}
		687	waitpid($pid, 0);
		688	$ret = $? >> 8;
		689
		690	if($ret) {
		691	$t = _("Error reading fingerprint from Certificate");
		692	GUI::HELPERS::print_warning($t, $ext);
		693	}
		694
		695	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha384 -in $file";
		696	$ext = "$cmd\n\n";
		697	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		698	while(<$rdfh>){
		699	$ext .= $_;
		700	($k, $v) = split(/=/);
		701	$tmp->{'FINGERPRINTSHA384'} = $v if($k =~ /SHA384 Fingerprint/i);
		702	chomp($tmp->{'FINGERPRINTSHA384'});
		703	}
		704	waitpid($pid, 0);
		705	$ret = $? >> 8;
		706
		707	if($ret) {
		708	$t = _("Error reading fingerprint from Certificate");
		709	GUI::HELPERS::print_warning($t, $ext);
		710	}
		711
		712	$cmd = "$self->{'bin'} x509 -noout -fingerprint -sha512 -in $file";
		713	$ext = "$cmd\n\n";
		714	$pid = open3($wtfh, $rdfh, $rdfh, $cmd);
		715	while(<$rdfh>){
		716	$ext .= $_;
		717	($k, $v) = split(/=/);
		718	$tmp->{'FINGERPRINTSHA512'} = $v if($k =~ /SHA512 Fingerprint/i);
		719	chomp($tmp->{'FINGERPRINTSHA512'});
		720	}
		721	waitpid($pid, 0);
		722	$ret = $? >> 8;
		723
		724	if($ret) {
		725	$t = _("Error reading fingerprint from Certificate");
		726	GUI::HELPERS::print_warning($t, $ext);
		727	}
		728
678	# get subject in openssl format	729	# get subject in openssl format
679	$cmd = "$self->{'bin'} x509 -noout -subject -in $file";	730	$cmd = "$self->{'bin'} x509 -noout -subject -in $file";
680	$ext = "$cmd\n\n";	731	$ext = "$cmd\n\n";

Lines 35-42 Link Here

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