wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some issues near recent chomp changes.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/CA.pl.in
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 {

2
crypto/perlasm/x86_64-xlate.pl
View file

@ -850,7 +850,7 @@ ___
OPTION DOTNAME
___
}
while($line=<>) {
while(defined($line=<>)) {
$line =~ s|\R$||; # Better chomp

6
util/files.pl
View file

@ -25,8 +25,8 @@ while (<>)
{
$b=$`; # Keep what is before the backslash
$o.=$b." ";
$b=<>;
$b =~ s|\R$||; # Better chomp
$b = "" unless defined($b = <>);
$b =~ s{\R$}{};
}
else
{
@ -43,7 +43,7 @@ while (<>)
}
}
$pwd=`pwd`; $pwd =~ s|\R$||;
($pwd=`pwd`) =~ s{\R$}{};
if ($sym{'TOP'} eq ".")
{

4
util/mk1mf.pl
View file

@ -553,8 +553,10 @@ if ($fips)
{
open (IN, "util/fipslib_path.txt") || fipslib_error();
$fipslibdir = <IN>;
$fipslibdir =~ s|\R$||;
close IN;
$fipslibdir = "" unless defined($fipslibdir);
$fipslibdir =~ s{\R$}{};
fipslib_error() if ($fipslibdir eq "");
}
fips_check_files($fipslibdir,
"fipscanister.lib", "fipscanister.lib.sha1",

4
util/mkfiles.pl
View file

@ -107,8 +107,8 @@ while (<IN>)
{
$b=$`;
$o.=$b." ";
$b=<IN>;
$b =~ s|\R$||;
$b = "" unless defined($b = <IN>);
$b =~ s{\R$}{};
}
else
{