rpms/crypto-utils/devel genkey.pl,1.14,1.15
Elio Maldonado (emaldonado)
fedora-extras-commits at redhat.com
Wed May 7 18:48:53 UTC 2008
Author: emaldonado
Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24773
Modified Files:
genkey.pl
Log Message:
Ensure nickname isn't empty and restore support for skip_random (#346731)
Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- genkey.pl 7 May 2008 04:19:26 -0000 1.14
+++ genkey.pl 7 May 2008 18:48:17 -0000 1.15
@@ -130,6 +130,7 @@
'nss|n' => \$nss,
'makeca' => \$ca_mode) or usage();
usage() unless @ARGV != 0;
+$skip_random = $test_mode;
$overwrite_key = $test_mode && !$nss;
$servername = $ARGV[0];
$randfile = $ssltop."/.rand.".$$;
@@ -1207,7 +1208,7 @@
if (!-f $certfile) {
if ($nss) {
makeCertNSS($certfile,
- $subject, $cert_days, $nickname,
+ $subject, $cert_days, $nssNickname,
$randfile, $tmpPasswordFile);
} else {
makeCertOpenSSL($keyfile,$certfile,
@@ -1319,7 +1320,7 @@
if ($nss) {
makeCertNSS($certfile, # output
- $subject,$cert_days,$nickname,
+ $subject,$cert_days,$nssNickname,
$randfile,$tmpPasswordFile);
} else {
makeCertOpenSSL($keyfile,$certfile, # output
@@ -1347,8 +1348,8 @@
return $ret unless ($ret eq "Next");
if ($nss) {
- makeCertNSS($certfile,$subject,730,$nickname,
- $randfile,"");
+ makeCertNSS($certfile,$subject,730,$nssNickname,
+ $randfile,$tmpPasswordFile);
} else {
makeCertOpenSSL($keyfile,$certfile,$subject,730,
$randfile,$tmpPasswordFile);
@@ -1360,9 +1361,10 @@
sub getRandomDataWindow()
{
my $randbits = $bits * 2;
-
+
# Get some random data from truerand library
-#
+#
+ if (!$skip_random) {
FinishRoot();
InitRoot(0);
makerand($randbits,$randfile);
@@ -1370,8 +1372,16 @@
# Get some random data from keystrokes
#
- Newt::Suspend();
- system("$bindir/keyrand $randbits $randfile");
- Newt::Resume();
+ Newt::Suspend();
+
+ system("$bindir/keyrand $randbits $randfile");
+
+ Newt::Resume();
+ } else {
+# No extra random seed is being provided to nss. Rely
+# on nss faster autoseeding process. The nss utilities
+# will prompt the user for some keystrokes.
+ $randfile = '';
+ }
return "Next";
}
More information about the fedora-extras-commits
mailing list