[openssl-commits] [openssl] master update

Rich Salz rsalz at openssl.org
Mon Apr 4 22:45:01 UTC 2016


The branch master has been updated
       via  3e3957816c131e536b0b5122b65dcbe28ee6e0ac (commit)
       via  b2be6ed0509315d15a75f7c7c9c19e04d6b8949e (commit)
       via  76c1183dee1699601d843663c86e90fff2c23934 (commit)
      from  e771eea6d8ca3caa48076367ee86c3b55249dcb3 (commit)


- Log -----------------------------------------------------------------
commit 3e3957816c131e536b0b5122b65dcbe28ee6e0ac
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Mar 29 21:30:11 2016 +0200

    set exec attribute for .pl files
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b2be6ed0509315d15a75f7c7c9c19e04d6b8949e
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Mar 29 21:26:39 2016 +0200

    fix perl shebang
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 76c1183dee1699601d843663c86e90fff2c23934
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Mar 29 16:25:18 2016 +0200

    use whitespace more consistently
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ms/cmp.pl      | 60 +++++++++++++++++++++++++++++-----------------------------
 ms/segrenam.pl | 40 +++++++++++++++++++--------------------
 2 files changed, 50 insertions(+), 50 deletions(-)
 mode change 100644 => 100755 ms/cmp.pl
 mode change 100644 => 100755 ms/segrenam.pl

diff --git a/ms/cmp.pl b/ms/cmp.pl
old mode 100644
new mode 100755
index 95b257f..31d7e1e
--- a/ms/cmp.pl
+++ b/ms/cmp.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 
 ($#ARGV == 1) || die "usage: cmp.pl <file1> <file2>\n";
 
@@ -10,38 +10,38 @@ binmode IN1;
 $tot=0;
 $ret=1;
 for (;;)
-	{
-	$n1=sysread(IN0,$b1,4096);
-	$n2=sysread(IN1,$b2,4096);
+{
+    $n1=sysread(IN0,$b1,4096);
+    $n2=sysread(IN1,$b2,4096);
 
-	last if ($n1 != $n2);
-	last if ($b1 ne $b2);
-	last if ($n1 < 0);
-	if ($n1 == 0)
-		{
-		$ret=0;
-		last;
-		}
-	$tot+=$n1;
-	}
+    last if ($n1 != $n2);
+    last if ($b1 ne $b2);
+    last if ($n1 < 0);
+    if ($n1 == 0)
+    {
+        $ret=0;
+        last;
+    }
+    $tot+=$n1;
+}
 
 close(IN0);
 close(IN1);
 if ($ret)
-	{
-	printf STDERR "$ARGV[0] and $ARGV[1] are different\n";
-	@a1=unpack("C*",$b1);
-	@a2=unpack("C*",$b2);
-	for ($i=0; $i<=$#a1; $i++)
-		{
-		if ($a1[$i] ne $a2[$i])
-			{
-			printf "%02X %02X <<\n",$a1[$i],$a2[$i];
-			last;
-			}
-		}
-	$nm=$tot+$n1;
-	$tot+=$i+1;
-	printf STDERR "diff at char $tot of $nm\n";
-	}
+{
+    printf STDERR "$ARGV[0] and $ARGV[1] are different\n";
+    @a1=unpack("C*",$b1);
+    @a2=unpack("C*",$b2);
+    for ($i=0; $i<=$#a1; $i++)
+    {
+        if ($a1[$i] ne $a2[$i])
+        {
+            printf "%02X %02X <<\n",$a1[$i],$a2[$i];
+            last;
+        }
+    }
+    $nm=$tot+$n1;
+    $tot+=$i+1;
+    printf STDERR "diff at char $tot of $nm\n";
+}
 exit($ret);
diff --git a/ms/segrenam.pl b/ms/segrenam.pl
old mode 100644
new mode 100755
index 2ab22a0..7e64c8e
--- a/ms/segrenam.pl
+++ b/ms/segrenam.pl
@@ -7,17 +7,17 @@ unpack("L",pack("N",1))!=1 || die "only little-endian hosts are supported";
 # first argument can specify custom suffix...
 $suffix=(@ARGV[0]=~/^\$/) ? shift(@ARGV) : "\$m";
 #################################################################
-# rename segments in COFF modules according to %map table below	#
-%map=(	".text" => "fipstx$suffix",				#
-	".text\$"=> "fipstx$suffix",				#
-	".rdata"=> "fipsrd$suffix",				#
-	".data" => "fipsda$suffix"	);			#
+# rename segments in COFF modules according to %map table below #
+%map=( ".text"  => "fipstx$suffix",                             #
+       ".text\$"=> "fipstx$suffix",                             #
+       ".rdata" => "fipsrd$suffix",                             #
+       ".data"  => "fipsda$suffix" );                           #
 #################################################################
 
 # collect file list
 foreach (@ARGV) {
-    if (/\*/)	{ push(@files,glob($_)); }
-    else	{ push(@files,$_);       }
+    if (/\*/) { push(@files,glob($_)); }
+    else      { push(@files,$_);       }
 }
 
 use Fcntl;
@@ -33,13 +33,13 @@ foreach (@files) {
     sysread(FD,$mz,64)==64 || die "$file is too short";
     @dos_header=unpack("a2C58I",$mz);
     if (@dos_header[0] eq "MZ") {
-	$e_lfanew=pop(@dos_header);
-	sysseek(FD,$e_lfanew,SEEK_SET)	|| die "$file is too short";
-	sysread(FD,$Magic,4)==4		|| die "$file is too short";
-	unpack("I",$Magic)==0x4550	|| die "$file is not COFF image";
+        $e_lfanew=pop(@dos_header);
+        sysseek(FD,$e_lfanew,SEEK_SET) || die "$file is too short";
+        sysread(FD,$Magic,4)==4        || die "$file is too short";
+        unpack("I",$Magic)==0x4550     || die "$file is not COFF image";
     } elsif ($file =~ /\.obj$/i) {
-	# .obj files have no IMAGE_DOS_HEADER
-	sysseek(FD,0,SEEK_SET)		|| die "unable to rewind $file";
+        # .obj files have no IMAGE_DOS_HEADER
+        sysseek(FD,0,SEEK_SET)         || die "unable to rewind $file";
     } else { next; }
 
     # read IMAGE_FILE_HEADER
@@ -53,13 +53,13 @@ foreach (@files) {
 
     # traverse IMAGE_SECTION_HEADER table
     for($i=0;$i<$NumberOfSections;$i++) {
-	sysread(FD,$SectionHeader,40)==40 || die "$file is too short";
-	($Name, at opaque)=unpack("Z8C*",$SectionHeader);
-	if ($map{$Name}) {
-	    sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file";
-	    syswrite(FD,pack("a8C*",$map{$Name}, at opaque))==40 || die "syswrite failed: $!";
-	    printf "    %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet;
-	}
+        sysread(FD,$SectionHeader,40)==40 || die "$file is too short";
+        ($Name, at opaque)=unpack("Z8C*",$SectionHeader);
+        if ($map{$Name}) {
+            sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file";
+            syswrite(FD,pack("a8C*",$map{$Name}, at opaque))==40 || die "syswrite failed: $!";
+            printf "    %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet;
+        }
     }
     close(FD);
 }


More information about the openssl-commits mailing list