Added support for SHA256. Applied fixes from debian and some other sources.

Improved gui behavior.
This commit is contained in:
2016-12-05 21:25:21 +01:00
parent e136e7cbbf
commit 4bb2b88a2a
17 changed files with 255 additions and 61 deletions

View File

@@ -70,6 +70,9 @@ sub new {
'STATUS' => _("Status"),
'FINGERPRINTMD5' => _("Fingerprint (MD5)"),
'FINGERPRINTSHA1' => _("Fingerprint (SHA1)"),
'FINGERPRINTSHA256' => _("Fingerprint (SHA256)"),
'FINGERPRINTSHA384' => _("Fingerprint (SHA384)"),
'FINGERPRINTSHA512' => _("Fingerprint (SHA512)"),
_("Not set") => 'none',
_("Ask User") => 'user',
_("critical") => 'critical',

View File

@@ -624,7 +624,7 @@ sub selection_cadir {
$dir = $self->{'actdir'};
# cut off the last directory name to provide the ca-directory
$dir =~ s/\/certs|\/req|\/keys$//;
$dir =~ s/(\/certs|\/req|\/keys)$//;
return($dir);
}

View File

@@ -90,6 +90,15 @@ sub display {
'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 (($mode eq 'cert') || ($mode eq 'cacert')) {