Commit ce3d25d3 authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Fix some issues near recent chomp changes. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent e314c340

apps/CA.pl.in

+3 −3
Original line number Diff line number Diff line
@@ -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 {

crypto/perlasm/x86_64-xlate.pl

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ ___ 
OPTION	DOTNAME

___

}

while($line=<>) {

while(defined($line=<>)) {



    $line =~ s|\R$||;           # Better chomp

util/files.pl

+3 −3
Original line number Diff line number Diff line
@@ -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 ".")

	{

util/mk1mf.pl

+3 −1
Original line number Diff line number Diff line
@@ -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",

util/mkfiles.pl

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ while (<IN>) 
				{

				$b=$`;

				$o.=$b." ";

				$b=<IN>;

				$b =~ s|\R$||;

				$b = "" unless defined($b = <IN>);

				$b =~ s{\R$}{};

				}

			else

				{