[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Fri May 27 15:42:01 UTC 2016


The branch master has been updated
       via  ac1a998d04a66e69ad36141a0254cf8baf3aa5d0 (commit)
       via  04b7805a8686d33186ca9e0571355e7fa2ef2d86 (commit)
       via  cb66390857fe9477e567f163302b4e34aeff8e6e (commit)
       via  a3a08f81256f4e9156e384c224adcc8e0519577b (commit)
      from  cbece22079a61e57d17858174ee57e7dffa9e4dd (commit)


- Log -----------------------------------------------------------------
commit ac1a998d04a66e69ad36141a0254cf8baf3aa5d0
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 25 15:03:08 2016 +0200

    make sure to put quotes around -config argument, in case of spaces
    
    RT#4486
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 04b7805a8686d33186ca9e0571355e7fa2ef2d86
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 25 15:02:20 2016 +0200

    perl glob: make sure to put quotes around the pattern, in case of spaces
    
    RT#4486
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit cb66390857fe9477e567f163302b4e34aeff8e6e
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 25 11:58:19 2016 +0200

    Windows makefile: handle the case with space in source directory
    
    This applies when building out-of-source.
    
    RT#4486
    
    NOTE: we can't do the same for Unix, as Unix make doesn't handle this
    type of issue.  Also, directory specs are much less likely to have
    spaces on Unix...
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit a3a08f81256f4e9156e384c224adcc8e0519577b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 25 11:57:23 2016 +0200

    Configure: handle spaces in source directory spec
    
    RT#4486
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 101 ++++++++++++++++++-----------------
 Configure                            |   4 +-
 test/recipes/80-test_ca.t            |   6 +--
 test/recipes/80-test_ssl_new.t       |   2 +-
 test/run_tests.pl                    |   4 +-
 util/process_docs.pl                 |   4 +-
 6 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 454f2ed..9a8109f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -161,7 +161,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)
 	set PERL=$(PERL)
-	$(PERL) $(SRCDIR)\test\run_tests.pl $(TESTS)
+	"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
 	@rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
 	@echo "Tests are not supported with your chosen Configure options"
 	@rem {- output_on() if !$disabled{tests}; "" -}
@@ -169,16 +169,16 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
 list-tests:
 	@set TOP=$(SRCDIR)
 	@set PERL=$(PERL)
-	@$(PERL) $(SRCDIR)\test\run_tests.pl list
+	@"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list
 
 install: install_sw install_ssldirs install_docs
 
 uninstall: uninstall_docs uninstall_sw
 
 libclean:
-	$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
-	$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """apps/$$1.*"""; } @ARGV" $(SHLIBS)
-	$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS)
+	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
+	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """apps/$$1.*"""; } @ARGV" $(SHLIBS)
+	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS)
 	-del /Q /F $(LIBS)
 	-del /Q ossl_static.pdb
 
@@ -204,33 +204,33 @@ install_sw: all install_dev install_engines install_runtime
 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 
 install_docs:
-        $(PERL) $(SRCDIR)\util\process_docs.pl \
+        "$(PERL)" "$(SRCDIR)\util\process_docs.pl" \
                 "--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html
 
 uninstall_docs:
 
 install_ssldirs:
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\misc"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(OPENSSLDIR)\certs"
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(OPENSSLDIR)\private"
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(OPENSSLDIR)\misc"
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\openssl.cnf" \
                                        "$(DESTDIR)$(OPENSSLDIR)"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(MISC_SCRIPTS) \
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \
                                         "$(DESTDIR)$(OPENSSLDIR)\misc"
 
 install_dev:
 	@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
 	@echo *** Installing development files
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\include\openssl"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\include\openssl\*.h \
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\include\openssl"
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \
 				       "$(DESTDIR)$(INSTALLTOP)\include\openssl"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(BLDDIR)\include\openssl\*.h \
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \
 				       "$(DESTDIR)$(INSTALLTOP)\include\openssl"
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(LIBS) \
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(LIBS) \
 				       "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
 	@if "$(SHLIBS)"=="" \
-	 $(PERL) $(SRCDIR)\util\copy.pl ossl_static.pdb \
+	 "$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb \
                                        "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
 
 uninstall_dev:
@@ -238,38 +238,38 @@ uninstall_dev:
 install_engines:
 	@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
 	@echo *** Installing engines
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)"
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(ENGINESDIR)"
 	@if not "$(ENGINES)"=="" \
-	 $(PERL) $(SRCDIR)\util\copy.pl $(ENGINES) "$(DESTDIR)$(ENGINESDIR)"
+	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINES) "$(DESTDIR)$(ENGINESDIR)"
 	@if not "$(ENGINES)"=="" \
-	 $(PERL) $(SRCDIR)\util\copy.pl $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)"
+	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)"
 
 uninstall_engines:
 
 install_runtime:
 	@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
 	@echo *** Installing runtime files
-	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\bin"
+	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\bin"
 	@if not "$(SHLIBS)"=="" \
-	 $(PERL) $(SRCDIR)\util\copy.pl $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin"
+	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin"
 	@if not "$(SHLIBS)"=="" \
-	 $(PERL) $(SRCDIR)\util\copy.pl $(SHLIBPDBS) \
+	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBPDBS) \
                                         "$(DESTDIR)$(INSTALLTOP)\bin"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMS) \
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMS) \
                                         "$(DESTDIR)$(INSTALLTOP)\bin"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMPDBS) \
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMPDBS) \
                                         "$(DESTDIR)$(INSTALLTOP)\bin"
-	@$(PERL) $(SRCDIR)\util\copy.pl $(BIN_SCRIPTS) \
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \
                                         "$(DESTDIR)$(INSTALLTOP)\bin"
 
 uninstall_runtime:
 
 # Building targets ###################################################
 
-configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
+configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configure"
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
-	$(PERL) $(SRCDIR)\Configure reconf
+	"$(PERL)" "$(SRCDIR)\Configure" reconf
 	@echo "**************************************************"
 	@echo "***                                            ***"
 	@echo "***   Please run the same make command again   ***"
@@ -293,19 +293,20 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
   sub generatesrc {
       my %args = @_;
       (my $target = $args{src}) =~ s/\.[sS]$/.asm/;
-      my $generator = join(" ", @{$args{generator}});
-      my $generator_incs = join("", map { " -I".$_ } @{$args{generator_incs}});
-      my $incs = join("", map { " /I ".$_ } @{$args{incs}});
-      my $deps = join(" ", @{$args{generator_deps}}, @{$args{deps}});
+      my $generator = '"'.join('" "', @{$args{generator}}).'"';
+      my $generator_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}});
+      my $incs = join("", map { " /I \"$_\"" } @{$args{incs}});
+      my $deps = @{$args{deps}} ?
+          '"'.join('" "', @{$args{generator_deps}}, @{$args{deps}}).'"' : '';
 
       if ($target !~ /\.asm$/) {
           return <<"EOF";
-$target: $args{generator}->[0] $deps
-	\$(PERL)$generator_incs $generator > \$@
+$target: "$args{generator}->[0]" $deps
+	"\$(PERL)"$generator_incs $generator > \$@
 EOF
       } else {
           if ($args{generator}->[0] =~ /\.pl$/) {
-              $generator = '$(PERL)'.$generator_incs.' '.$generator;
+              $generator = '"$(PERL)"'.$generator_incs.' '.$generator;
           } elsif ($args{generator}->[0] =~ /\.S$/) {
               $generator = undef;
           } else {
@@ -317,7 +318,7 @@ EOF
               # end up generating foo.s in two steps.
               if ($args{src} =~ /\.S$/) {
                    return <<"EOF";
-$target: $args{generator}->[0] $deps
+$target: "$args{generator}->[0]" $deps
 	set ASM=\$(AS)
 	$generator \$@.S
 	\$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@
@@ -326,14 +327,14 @@ EOF
               }
               # Otherwise....
               return <<"EOF";
-$target: $args{generator}->[0] $deps
+$target: "$args{generator}->[0]" $deps
 	set ASM=\$(AS)
 	$generator \$@
 EOF
           }
           return <<"EOF";
-$target: $args{generator}->[0] $deps
-	\$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \$@.i && move /Y \$@.i \$@
+$target: "$args{generator}->[0]" $deps
+	\$(CC) \$(CFLAGS) $incs /EP /C "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@
 EOF
       }
   }
@@ -343,12 +344,12 @@ EOF
      my $obj = $args{obj};
      my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
                     } ( @{$args{srcs}} );
-     my $srcs = join(" ",  @srcs);
-     my $deps = join(" ", @srcs, @{$args{deps}});
-     my $incs = join("", map { " /I ".$_ } @{$args{incs}});
+     my $srcs = '"'.join('" "',  @srcs).'"';
+     my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"';
+     my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}});
      unless ($disabled{zlib}) {
          if ($withargs{zlib_include}) {
-             $incs .= " /I ".$withargs{zlib_include};
+             $incs .= ' /I "'.$withargs{zlib_include}.'"';
          }
      }
      my $ecflags = { lib => '$(LIB_CFLAGS)',
@@ -364,7 +365,7 @@ EOF
      return <<"EOF"	if (!$disabled{makedepend});
 $obj$depext: $deps
 	\$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\
-	    \$(PERL) -n << > $obj$depext
+	    "\$(PERL)" -n << > $obj$depext
 chomp;
 s/^Note: including file: *//;
 \$\$collect{\$\$_} = 1;
@@ -404,11 +405,11 @@ EOF
 			   rel2abs($config{builddir}));
      my $target = shlib_import($lib);
      return <<"EOF"
-$target: $deps $ordinalsfile $mkdef_pl
-	\$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def
-	\$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def
+$target: $deps "$ordinalsfile" "$mkdef_pl"
+	"\$(PERL)" "$mkdef_pl" "$mkdef_key" 32 > $shlib.def
+	"\$(PERL)" -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def
 	DEL $shlib.def.tmp
-	\$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc
+	"\$(PERL)" "$mkrc_pl" $shlib$shlibext > $shlib.rc
 	\$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc
 	\$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
 		/implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
@@ -478,13 +479,13 @@ EOF
   sub in2script {
       my %args = @_;
       my $script = $args{script};
-      my $sources = join(" ", @{$args{sources}});
+      my $sources = '"'.join('" "', @{$args{sources}}).'"';
       my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
                                            "util", "dofile.pl")),
                            rel2abs($config{builddir}));
       return <<"EOF";
 $script: $sources
-	\$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
+	"\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
 	    "-o$target{build_file}" $sources > "$script"
 EOF
   }
diff --git a/Configure b/Configure
index 37ace21..0c87cd1 100755
--- a/Configure
+++ b/Configure
@@ -210,7 +210,7 @@ die "erroneous version information in opensslv.h: ",
 # Collect target configurations
 
 my $pattern = catfile(dirname($0), "Configurations", "*.conf");
-foreach (sort glob($pattern) ) {
+foreach (sort glob("\"$pattern\"") ) {
     &read_config($_);
 }
 
@@ -2332,7 +2332,7 @@ sub run_dofile
     foreach (@templates) {
         die "Can't open $_, $!" unless -f $_;
     }
-    my $cmd = "$config{perl} \"-I.\" \"-Mconfigdata\" $dofile -o\"Configure\" \"".join("\" \"", at templates)."\" > \"$out.new\"";
+    my $cmd = "$config{perl} \"-I.\" \"-Mconfigdata\" \"$dofile\" -o\"Configure\" \"".join("\" \"", at templates)."\" > \"$out.new\"";
     #print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
     system($cmd);
     exit 1 if $? != 0;
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 8e01d5f..cd42687 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -24,17 +24,17 @@ rmtree("demoCA", { safe => 0 });
 
 plan tests => 4;
  SKIP: {
-     $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "CAss.cnf");
+     $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "CAss.cnf").'"';
      skip "failed creating CA structure", 3
 	 if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef)),
 		'creating CA structure');
 
-     $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "Uss.cnf");
+     $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
      skip "failed creating new certificate request", 2
 	 if !ok(run(perlapp(["CA.pl","-newreq"])),
 		'creating CA structure');
 
-     $ENV{OPENSSL_CONFIG} = "-config ".$std_openssl_cnf;
+     $ENV{OPENSSL_CONFIG} = '-config "'.$std_openssl_cnf.'"';
      skip "failed to sign certificate request", 1
 	 if !is(yes(cmdstr(perlapp(["CA.pl", "-sign"]))), 0,
 		'signing certificate request');
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 5cafb9f..07f1291 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -20,7 +20,7 @@ setup("test_ssl_new");
 
 $ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs");
 
-my @conf_srcs =  glob(srctop_file("test", "ssl-tests", "*.conf.in"));
+my @conf_srcs =  glob('"'.srctop_file("test", "ssl-tests", "*.conf.in").'"');
 map { s/;.*// } @conf_srcs if $^O eq "VMS";
 my @conf_files = map { basename($_) } @conf_srcs;
 map { s/\.in// } @conf_files;
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 158eaf9..6ce1521 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -42,13 +42,13 @@ my $list_mode = scalar(grep /^list$/, @tests) != 0;
 if (grep /^(alltests|list)$/, @tests) {
     @tests = grep {
 	basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-    } glob(catfile($recipesdir,"*.t"));
+    } glob('"'.catfile($recipesdir,"*.t").'"');
 } else {
     my @t = ();
     foreach (@tests) {
 	push @t, grep {
 	    basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-	} glob(catfile($recipesdir,"*-$_.t"));
+	} glob('"'.catfile($recipesdir,"*-$_.t").'"');
     }
     @tests = @t;
 }
diff --git a/util/process_docs.pl b/util/process_docs.pl
index c2c35ee..efc4ef5 100644
--- a/util/process_docs.pl
+++ b/util/process_docs.pl
@@ -72,9 +72,9 @@ my $symlink_exists = eval { symlink("",""); 1 };
 foreach my $subdir (keys %{$options{subdir}}) {
     my $section = $options{subdir}->{$subdir};
     my $podsourcedir = catfile($options{sourcedir}, $subdir);
-    my $podglob = catfile($podsourcedir, "*.pod");
+    my $podglob = '"'.catfile($podsourcedir, "*.pod").'"';
 
-    foreach my $podfile (glob "$podglob") {
+    foreach my $podfile (glob $podglob) {
         my $podname = basename($podfile, ".pod");
         my $podpath = catfile($podfile);
         my %podinfo = ( section => $section );


More information about the openssl-commits mailing list