[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  51cf8e0b50f677581bff2694942b690bbff630b7 (commit)
      from  6475b64978083750018db90c60f4df142aa2e28f (commit)


- Log -----------------------------------------------------------------
commit 51cf8e0b50f677581bff2694942b690bbff630b7
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 15 18:08:54 2018 +0100

    Configure: move down the treatment of seed sources
    
    Most of all, this is so it doesn't output mysterious text when we're
    treating the phony config targets LISH, HASH and TABLE
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5383)

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

Summary of changes:
 Configure | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Configure b/Configure
index cfe3625..9835cf0 100755
--- a/Configure
+++ b/Configure
@@ -886,17 +886,6 @@ if (grep { $_ =~ /(^|\s)-Wl,-rpath,/ } ($user{LDLIBS} ? @{$user{LDLIBS}} : ())
 	"***** any of asan, msan or ubsan\n";
 }
 
-if (scalar(@seed_sources) == 0) {
-    print "Using implicit seed configuration\n";
-    push @seed_sources, 'os';
-}
-die "Cannot seed with none and anything else"
-    if scalar(grep { $_ eq 'none' } @seed_sources) > 0
-        && scalar(@seed_sources) > 1;
-push @{$config{openssl_other_defines}},
-     map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" }
-	@seed_sources;
-
 my @tocheckfor = (keys %disabled);
 while (@tocheckfor) {
     my %new_tocheckfor = ();
@@ -940,6 +929,17 @@ if ($target eq "HASH") {
 print "Configuring OpenSSL version $config{version} ($config{version_num}) ";
 print "for $target\n";
 
+if (scalar(@seed_sources) == 0) {
+    print "Using os-specific seed configuration\n";
+    push @seed_sources, 'os';
+}
+die "Cannot seed with none and anything else"
+    if scalar(grep { $_ eq 'none' } @seed_sources) > 0
+        && scalar(@seed_sources) > 1;
+push @{$config{openssl_other_defines}},
+     map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" }
+	@seed_sources;
+
 # Backward compatibility?
 if ($target =~ m/^CygWin32(-.*)$/) {
     $target = "Cygwin".$1;