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

genkey: fix noise file handling

Browse Source
This commit is contained in:
Joe Orton 2014-02-13 12:26:37 +00:00
parent 7e9f7dac60
commit 7731df4cd6
2 changed files with 20 additions and 8 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 Summary: SSL certificate and key management utilities
Name: crypto-utils Name: crypto-utils
Version: 2.4.1 Version: 2.4.1
Release: 48%{?dist} Release: 49%{?dist}
Group: Applications/System Group: Applications/System
# certwatch.c is GPLv2 # certwatch.c is GPLv2
# pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+) # 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 %{perl_vendorarch}/auto/Crypt
%changelog %changelog
* Thu Feb 13 2014 Joe Orton <jorton@redhat.com> - 2.4.1-49
- genkey: fix noise file handling
* Mon Jan 27 2014 Joe Orton <jorton@redhat.com> - 2.4.1-48 * Mon Jan 27 2014 Joe Orton <jorton@redhat.com> - 2.4.1-48
- update certwatch man page (#618421) - update certwatch man page (#618421)

15
genkey.pl
View File

@ -979,7 +979,10 @@ sub makeCertNSS
nssUtilCmd("$bindir/certutil", $args); nssUtilCmd("$bindir/certutil", $args);
if ($noisefile) {
unlink($noisefile); unlink($noisefile);
$noisefile = '';
}
if ($certfile && !-f $certfile) { if ($certfile && !-f $certfile) {
Newt::newtWinMessage("Error", "Close", Newt::newtWinMessage("Error", "Close",
@ -1015,7 +1018,10 @@ sub genRequestNSS
nssUtilCmd("$bindir/certutil", $args); nssUtilCmd("$bindir/certutil", $args);
if ($noisefile) {
unlink($noisefile); unlink($noisefile);
$noisefile = '';
}
if (!-f $csrfile) { if (!-f $csrfile) {
Newt::newtWinMessage("Error", "Close", Newt::newtWinMessage("Error", "Close",
@ -1055,7 +1061,7 @@ sub makeCertOpenSSL
Newt::newtWinMessage("Error", "Close", Newt::newtWinMessage("Error", "Close",
"Was not able to create a certificate for this ". "Was not able to create a certificate for this ".
"host:\n\nPress return to exit"); "host:\n\nPress return to exit");
unlink($noisefile); unlink($noisefile) if $noisefile;
Newt::Finished(); Newt::Finished();
exit 1; exit 1;
} }
@ -1065,7 +1071,7 @@ sub makeCertOpenSSL
"Could not set permissions of private key file.\n". "Could not set permissions of private key file.\n".
"$keyfile"); "$keyfile");
Newt::Finished(); Newt::Finished();
unlink($noisefile); unlink($noisefile) if $noisefile;
exit 1; exit 1;
} }
} }
@ -1098,7 +1104,10 @@ sub genRequestOpenSSL
nssUtilCmd("$bindir/keyutil", $args); nssUtilCmd("$bindir/keyutil", $args);
if ($noisefile) {
unlink($noisefile); unlink($noisefile);
$noisefile = '';
}
Newt::Resume(); Newt::Resume();
if (!-f $csrfile) { if (!-f $csrfile) {
@ -1175,10 +1184,10 @@ sub renewCertOpenSSL
$args .= "--filepwdnss $pwdfile " if $pwdfile; $args .= "--filepwdnss $pwdfile " if $pwdfile;
$args .= "--validity $months "; $args .= "--validity $months ";
$args .= "--out $csrfile "; $args .= "--out $csrfile ";
### pass $noisefile?
nssUtilCmd("$bindir/keyutil", $args); nssUtilCmd("$bindir/keyutil", $args);
unlink($noisefile);
Newt::Resume(); Newt::Resume();
if (!-f $csrfile) { if (!-f $csrfile) {