[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9f519addc09b2005fa8c6cde36e3267de02577bb (commit)
       via  01d9997659d910882790765f213f01e58b9f5cb1 (commit)
      from  bae26b582e6cbff4bce5edc46907e6f331bc19e5 (commit)


- Log -----------------------------------------------------------------
commit 9f519addc09b2005fa8c6cde36e3267de02577bb
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 14 10:03:14 2016 +0100

    Enforce the demand for Perl 5.10.0 as a minimum.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 01d9997659d910882790765f213f01e58b9f5cb1
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 14 10:02:13 2016 +0100

    Fix a few Configure errors
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf | 13 +++++++------
 Configure                   | 15 +++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index fa9af88..cddf268 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -52,8 +52,9 @@ sub vc_wince_info {
         my $wcelflag = "/subsystem:windowsce,$1.$2";        # ...,N.NN
 
         my $wceplatf =  $ENV{'PLATFORM'};
-        my $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
-        my $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
+
+        $wceplatf =~ tr/a-z0-9 /A-Z0-9_/;
+        $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
 
         my $wcetgt = $ENV{'TARGETCPU'};                     # just shorter name...
       SWITCH: for($wcetgt) {
@@ -532,10 +533,10 @@ sub vc_wince_info {
     "hpux64-ia64-gcc" => {
         inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => picker(default => "-mlp64 -DB_ENDIAN",
-                                   debug   => "-O0 -g",
-                                   release => "-O3",
-                                   threads("-pthread")),
+        cflags           => combine(picker(default => "-mlp64 -DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
         ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         thread_scheme    => "pthreads",
diff --git a/Configure b/Configure
index 17bc6c2..26bbfbf 100755
--- a/Configure
+++ b/Configure
@@ -1,13 +1,9 @@
 #! /usr/bin/env perl
 # -*- mode: perl; -*-
 
-##
 ##  Configure -- OpenSSL source tree configuration script
-##  If editing this file, run this command before committing
-##	make -f Makefile.in TABLE
-##
 
-require 5.000;
+require 5.10.0;
 use strict;
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
@@ -202,7 +198,6 @@ foreach (sort glob($pattern) ) {
 
 print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
 
-$config{perl};
 $config{prefix}="";
 $config{openssldir}="";
 $config{processor}="";
@@ -746,7 +741,7 @@ while (@tocheckfor) {
 	my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy);
 	if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) {
 	    map {
-		$new_tocheckfor{$_} => 1; $disabled{$_} = "forced";
+		$new_tocheckfor{$_} = 1; $disabled{$_} = "forced";
 	    } grep { !defined($disabled{$_}) } @$descendents;
 	}
     }
@@ -1153,7 +1148,7 @@ die "Exactly one of SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT can be set
 
 # "Stringify" the C flags string.  This permits it to be made part of a string
 # and works as well on command lines.
-$config{cflags} =~ s/([\\\"])/\\\1/g;
+$config{cflags} =~ s/([\\\"])/\\$1/g;
 
 if (defined($config{api})) {
     $config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ];
@@ -1798,7 +1793,7 @@ print "SIXTY_FOUR_BIT_LONG mode\n" if $config{b64l};
 print "SIXTY_FOUR_BIT mode\n" if $config{b64};
 print "THIRTY_TWO_BIT mode\n" if $config{b32};
 print "BN_LLONG mode\n" if $config{bn_ll};
-print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int;
+print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int;
 
 for (@generated_headers) {
     mkpath(catdir($blddir, dirname($_)));
@@ -2210,7 +2205,7 @@ sub usage
 	exit(1);
 	}
 
-sub run_dofile()
+sub run_dofile
 {
     my $out = shift;
     my @templates = @_;