[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1af563e3742c5be733194dab9778e064984b3c23 (commit)
      from  d16a2c1931534cfc798a15c255e17180844d2ceb (commit)


- Log -----------------------------------------------------------------
commit 1af563e3742c5be733194dab9778e064984b3c23
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Feb 22 15:36:27 2018 -0500

    Remove unused num.pl,segregnam scripts
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5433)

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

Summary of changes:
 crypto/lhash/num.pl | 23 -----------------
 ms/segrenam.pl      | 71 -----------------------------------------------------
 2 files changed, 94 deletions(-)
 delete mode 100644 crypto/lhash/num.pl
 delete mode 100755 ms/segrenam.pl

diff --git a/crypto/lhash/num.pl b/crypto/lhash/num.pl
deleted file mode 100644
index 8a8c42c..0000000
--- a/crypto/lhash/num.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env perl
-# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
-#
-# Licensed under the OpenSSL license (the "License").  You may not use
-# this file except in compliance with the License.  You can obtain a copy
-# in the file LICENSE in the source distribution or at
-# https://www.openssl.org/source/license.html
-
-#node     10 ->   4
-
-while (<>)
-	{
-	next unless /^node/;
-	s|\R$||;                # Better chomp
-	@a=split;
-	$num{$a[3]}++;
-	}
-
- at a=sort {$a <=> $b } keys %num;
-foreach (0 .. $a[$#a])
-	{
-	printf "%4d:%4d\n",$_,$num{$_};
-	}
diff --git a/ms/segrenam.pl b/ms/segrenam.pl
deleted file mode 100755
index 353a0ef..0000000
--- a/ms/segrenam.pl
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /usr/bin/env perl
-# Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
-#
-# Licensed under the OpenSSL license (the "License").  You may not use
-# this file except in compliance with the License.  You can obtain a copy
-# in the file LICENSE in the source distribution or at
-# https://www.openssl.org/source/license.html
-
-my $quiet = 1;
-
-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" );                           #
-#################################################################
-
-# collect file list
-foreach (@ARGV) {
-    if (/\*/) { push(@files,glob($_)); }
-    else      { push(@files,$_);       }
-}
-
-use Fcntl;
-use Fcntl ":seek";
-
-foreach (@files) {
-    $file=$_;
-    print "processing $file\n" unless $quiet;
-
-    sysopen(FD,$file,O_RDWR|O_BINARY) || die "sysopen($file): $!";
-
-    # read IMAGE_DOS_HEADER
-    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";
-    } elsif ($file =~ /\.obj$/i) {
-        # .obj files have no IMAGE_DOS_HEADER
-        sysseek(FD,0,SEEK_SET)         || die "unable to rewind $file";
-    } else { next; }
-
-    # read IMAGE_FILE_HEADER
-    sysread(FD,$coff,20)==20 || die "$file is too short";
-    ($Machine,$NumberOfSections,$TimeDateStamp,
-     $PointerToSymbolTable,$NumberOfSymbols,
-     $SizeOfOptionalHeader,$Characteristics)=unpack("SSIIISS",$coff);
-
-    # skip over IMAGE_OPTIONAL_HEADER
-    sysseek(FD,$SizeOfOptionalHeader,SEEK_CUR) || die "$file is too short";
-
-    # 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;
-        }
-    }
-    close(FD);
-}