rpms
/
crypto-utils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genkey: only fail if --nss is specified and mod_nss is absent (#845942) 

Resolves: rhbz#845942
This commit is contained in:
Joe Orton 2014-02-13 23:02:09 +00:00
parent c0b5ca0b27
commit d4556f5002
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto-utils.spec
View File

@ -4,7 +4,7 @@
Summary: SSL certificate and key management utilities
Name: crypto-utils
Version: 2.4.1
Release: 51%{?dist}
Release: 52%{?dist}
Group: Applications/System
# certwatch.c is GPLv2
# pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
@ -135,6 +135,9 @@ chmod -R u+w $RPM_BUILD_ROOT
%{perl_vendorarch}/auto/Crypt
%changelog
* Thu Feb 13 2014 Joe Orton <jorton@redhat.com> - 2.4.1-52
- genkey: only fail if --nss is specified and mod_nss is absent (#845942)
* Thu Feb 13 2014 Joe Orton <jorton@redhat.com> - 2.4.1-51
- certwatch: fix handling of files containing private keys

20
genkey.pl
View File

@ -342,18 +342,18 @@ sub NextBackCancelButton {
# Require that this Apache module (mod_nss or mod_ssl) be installed
sub requireModule {
my $module = $nss ? "mod_nss" : "mod_ssl";
my $not_installed_msg = `rpm -q $module | grep "not installed"`;
if ($nss) {
my $not_installed_msg = `rpm -q mod_nss | grep "not installed"`;
if ($not_installed_msg) {
Newt::newtWinMessage("Error", "Close",
"$not_installed_msg".
"\nIt is required to generate this type of CSRs or certs".
"for this host:\n\nPress return to exit");
Newt::Finished();
exit 1;
}
Newt::newtWinMessage("Error", "Close",
"$not_installed_msg".
"\nIt is required to generate this type of CSRs or certs ".
"for this host.\n\nPress return to exit");
Newt::Finished();
exit 1;
}
}
}
# Check that nss.conf exists