diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-12 02:38:22 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2018-09-20 13:44:53 +0200 |
| commit | a2a9f8896b861fbc2cf52bbc19cde1cf91fea0ee (patch) | |
| tree | 18524a2aeae122efc011e56204339da5e7130b8b /util | |
| parent | 226e6a2cf2797aed7ed59eeb05858b5a7491a0ad (diff) | |
util/mkdef.pl, util/add-depends.pl: don't lowercase file names
It turns out to be detrimental on some file systems that may or may not
be case sensitive (such as NTFS, which has a case sensitive mode).
Fixes #7172
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7172)
(cherry picked from commit d3c72e392ab72d418ea5147857701a8730def3fd)
Diffstat (limited to 'util')
| -rw-r--r-- | util/add-depends.pl | 6 | ||||
| -rwxr-xr-x | util/mkdef.pl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/util/add-depends.pl b/util/add-depends.pl index 3ba266e353..deb0de238a 100644 --- a/util/add-depends.pl +++ b/util/add-depends.pl @@ -63,7 +63,7 @@ my $abs_blddir = rel2abs($blddir); # files we depend on in the same directory that only differ by character case, # we're fine. my %depconv_cache = - map { lc catfile($abs_blddir, $_) => $_ } + map { catfile($abs_blddir, $_) => $_ } keys %{$unified_info{generate}}; my %procedures = ( @@ -139,7 +139,7 @@ my %procedures = ( # VMS C gives us absolute paths, always. Let's see if we can # make them relative instead. - $line = lc canonpath($line); + $line = canonpath($line); unless (defined $depconv_cache{$line}) { my $dep = $line; @@ -184,7 +184,7 @@ my %procedures = ( # VC gives us absolute paths for all include files, so to # remove system header dependencies, we need to check that # they don't match $abs_srcdir or $abs_blddir. - $tail = lc canonpath($tail); + $tail = canonpath($tail); unless (defined $depconv_cache{$tail}) { my $dep = $tail; diff --git a/util/mkdef.pl b/util/mkdef.pl index 327728eeda..657162b460 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -247,7 +247,7 @@ $crypto.=" include/internal/o_str.h"; $crypto.=" include/internal/err.h"; $crypto.=" include/internal/sslconf.h"; foreach my $f ( glob(catfile($config{sourcedir},'include/openssl/*.h')) ) { - my $fn = "include/openssl/" . lc(basename($f)); + my $fn = "include/openssl/" . basename($f); $crypto .= " $fn" if !defined $skipthese{$fn}; } |