Ensure nickname isn't empty and restore support for skip_random (#346731)
This commit is contained in:
parent
69a51dc915
commit
028628ad36
24
genkey.pl
24
genkey.pl
|
@ -130,6 +130,7 @@ GetOptions('test|t' => \$test_mode,
|
||||||
'nss|n' => \$nss,
|
'nss|n' => \$nss,
|
||||||
'makeca' => \$ca_mode) or usage();
|
'makeca' => \$ca_mode) or usage();
|
||||||
usage() unless @ARGV != 0;
|
usage() unless @ARGV != 0;
|
||||||
|
$skip_random = $test_mode;
|
||||||
$overwrite_key = $test_mode && !$nss;
|
$overwrite_key = $test_mode && !$nss;
|
||||||
$servername = $ARGV[0];
|
$servername = $ARGV[0];
|
||||||
$randfile = $ssltop."/.rand.".$$;
|
$randfile = $ssltop."/.rand.".$$;
|
||||||
|
@ -1207,7 +1208,7 @@ sub genReqWindow
|
||||||
if (!-f $certfile) {
|
if (!-f $certfile) {
|
||||||
if ($nss) {
|
if ($nss) {
|
||||||
makeCertNSS($certfile,
|
makeCertNSS($certfile,
|
||||||
$subject, $cert_days, $nickname,
|
$subject, $cert_days, $nssNickname,
|
||||||
$randfile, $tmpPasswordFile);
|
$randfile, $tmpPasswordFile);
|
||||||
} else {
|
} else {
|
||||||
makeCertOpenSSL($keyfile,$certfile,
|
makeCertOpenSSL($keyfile,$certfile,
|
||||||
|
@ -1319,7 +1320,7 @@ sub genCertWindow
|
||||||
|
|
||||||
if ($nss) {
|
if ($nss) {
|
||||||
makeCertNSS($certfile, # output
|
makeCertNSS($certfile, # output
|
||||||
$subject,$cert_days,$nickname,
|
$subject,$cert_days,$nssNickname,
|
||||||
$randfile,$tmpPasswordFile);
|
$randfile,$tmpPasswordFile);
|
||||||
} else {
|
} else {
|
||||||
makeCertOpenSSL($keyfile,$certfile, # output
|
makeCertOpenSSL($keyfile,$certfile, # output
|
||||||
|
@ -1347,8 +1348,8 @@ sub genCACertWindow
|
||||||
return $ret unless ($ret eq "Next");
|
return $ret unless ($ret eq "Next");
|
||||||
|
|
||||||
if ($nss) {
|
if ($nss) {
|
||||||
makeCertNSS($certfile,$subject,730,$nickname,
|
makeCertNSS($certfile,$subject,730,$nssNickname,
|
||||||
$randfile,"");
|
$randfile,$tmpPasswordFile);
|
||||||
} else {
|
} else {
|
||||||
makeCertOpenSSL($keyfile,$certfile,$subject,730,
|
makeCertOpenSSL($keyfile,$certfile,$subject,730,
|
||||||
$randfile,$tmpPasswordFile);
|
$randfile,$tmpPasswordFile);
|
||||||
|
@ -1363,6 +1364,7 @@ sub getRandomDataWindow()
|
||||||
|
|
||||||
# Get some random data from truerand library
|
# Get some random data from truerand library
|
||||||
#
|
#
|
||||||
|
if (!$skip_random) {
|
||||||
FinishRoot();
|
FinishRoot();
|
||||||
InitRoot(0);
|
InitRoot(0);
|
||||||
makerand($randbits,$randfile);
|
makerand($randbits,$randfile);
|
||||||
|
@ -1370,8 +1372,16 @@ sub getRandomDataWindow()
|
||||||
|
|
||||||
# Get some random data from keystrokes
|
# Get some random data from keystrokes
|
||||||
#
|
#
|
||||||
Newt::Suspend();
|
Newt::Suspend();
|
||||||
system("$bindir/keyrand $randbits $randfile");
|
|
||||||
Newt::Resume();
|
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";
|
return "Next";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue