[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bb56561adbb6d2728b05e2df08c0575c38a46249 (commit)
       via  76ffb43d1ade66ca60f977aabdbf43995615da92 (commit)
      from  24dfa621c8171d89ea892502033c206fd530c5af (commit)


- Log -----------------------------------------------------------------
commit bb56561adbb6d2728b05e2df08c0575c38a46249
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 18 12:51:16 2015 +0200

    Refactor config - throw away '--test-sanity'
    
    Get rid of the --test-sanity option.  Since we no longer have string
    based configurations, we don't have the problem with miscounting
    colons any more.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 76ffb43d1ade66ca60f977aabdbf43995615da92
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 18 02:46:21 2015 +0200

    Refactor config - a small cosmetic touchup of Configure
    
    Start simple, removed some unused variables and change all '<<EOF' to
    '<<"EOF"'.  The latter is because some code colorizers (notably, in
    emacs) cannot recognise the here document end marker unless it's
    quoted and therefore assume the rest of the file is part of the here
    document.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 62 +++++++-------------------------------------------------------
 1 file changed, 7 insertions(+), 55 deletions(-)

diff --git a/Configure b/Configure
index 0efed39..9f88d12 100755
--- a/Configure
+++ b/Configure
@@ -127,11 +127,6 @@ my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
 # MD2_CHAR slags pentium pros
 my $x86_gcc_opts="RC4_INDEX MD2_INT";
 
-#$bits1="SIXTEEN_BIT ";
-#$bits2="THIRTY_TWO_BIT ";
-my $bits1="THIRTY_TWO_BIT ";
-my $bits2="SIXTY_FOUR_BIT ";
-
 # As for $BSDthreads. Idea is to maintain "collective" set of flags,
 # which would cover all BSD flavors. -pthread applies to them all,
 # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD
@@ -1056,10 +1051,6 @@ PROCESS_ARGS:
 
 			$threads = 1 if ($algo eq "threads");
 			}
-		elsif (/^--test-sanity$/)
-			{
-			exit(&test_sanity());
-			}
 		elsif (/^--strict-warnings$/)
 			{
 			$strict_warnings = 1;
@@ -2283,7 +2274,7 @@ find(sub {
 }
 if($IsMK1MF) {
 	open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
-	printf OUT <<EOF;
+	printf OUT <<"EOF";
 #ifndef MK1MF_BUILD
   /* auto-generated by Configure for crypto/cversion.c:
    * for Unix builds, crypto/Makefile.ssl generates functional definitions;
@@ -2314,7 +2305,7 @@ if ($IsMK1MF && ($target !~ /^netware/)) {
 		$v4=hex $4;
 	}
 	open (OUT,">ms/version32.rc") || die "Can't open ms/version32.rc";
-	print OUT <<EOF;
+	print OUT <<"EOF";
 #include <winver.h>
 
 LANGUAGE 0x09,0x01
@@ -2366,19 +2357,19 @@ EOF
 	close(OUT);
   }
 
-print <<EOF;
+print <<"EOF";
 
 Configured for $target.
 EOF
 
-print <<\EOF if (!$no_threads && !$threads);
+print <<"EOF" if (!$no_threads && !$threads);
 
 The library could not be configured for supporting multi-threaded
 applications as the compiler options required on this system are not known.
 See file INSTALL for details if you need multi-threading.
 EOF
 
-print <<\EOF if ($no_shared_warn);
+print <<"EOF" if ($no_shared_warn);
 
 You gave the option 'shared', which is not supported on this platform, so
 we will pretend you gave the option 'no-shared'.  If you know how to implement
@@ -2386,7 +2377,7 @@ shared libraries, please let us know (but please first make sure you have
 tried with a current version of OpenSSL).
 EOF
 
-print <<EOF if ($warn_make_depend);
+print <<"EOF" if ($warn_make_depend);
 
 *** Because of configuration changes, you MUST do the following before
 *** building:
@@ -2471,7 +2462,7 @@ sub print_table_entry
 	return if $table{$target}->{template};
 
 	if ($type eq "TABLE") {
-	    print <<EOF
+	    print <<"EOF"
 
 *** $target
 \$cc           = $table{$target}->{cc}
@@ -2565,42 +2556,3 @@ EOF
 	    print "    },\n";
 	}
 	}
-
-sub test_sanity
-	{
-	my $errorcnt = 0;
-
-	print STDERR "=" x 70, "\n";
-	print STDERR "=== SANITY TESTING!\n";
-	print STDERR "=== No configuration will be done, all other arguments will be ignored!\n";
-	print STDERR "=" x 70, "\n";
-
-	foreach $target (sort keys %table)
-		{
-		my $pre_dso_scheme = "perlasm_scheme";
-		my $dso_scheme = "dso_scheme";
-		my $post_dso_scheme = "shared_target";
-
-
-		if ($table{$target}->{$pre_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/)
-			{
-			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n";
-			print STDERR "              in the previous field\n";
-			}
-		elsif ($table{$target}->{$post_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/)
-			{
-			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n";
-			print STDERR "              in the following field\n";
-			}
-		elsif ($table{$target}->{$dso_scheme} !~ /^(beos|dl|dlfcn|win32|vms|)$/)
-			{
-			$errorcnt++;
-			print STDERR "SANITY ERROR: '$target' has the dso_scheme field = ",$table{$target}->{$dso_scheme},"\n";
-			print STDERR "              valid values are 'beos', 'dl', 'dlfcn', 'win32' and 'vms'\n";
-			}
-		}
-	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;
-	return $errorcnt;
-	}