Fix some issues near recent chomp changes.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Viktor Dukhovni
2016-02-13 02:53:13 -05:00
parent e314c34073
commit ce3d25d3e5
5 changed files with 12 additions and 10 deletions

View File

@@ -120,9 +120,9 @@ if ($WHAT eq '-newcert' ) {
close OUT;
# ask user for existing CA certificate
print "CA certificate filename (or enter to create)\n";
$FILE = <STDIN>;
$FILE = s|\R$|| if $FILE;
if ($FILE) {
$FILE = "" unless defined($FILE = <STDIN>);
$FILE =~ s{\R$}{};
if ($FILE ne "") {
copy_pemfile($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
copy_pemfile($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
} else {