diff options
| author | Don Lewis <truckman@apache.org> | 2016-08-19 18:28:06 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@apache.org> | 2016-08-19 18:28:06 +0000 |
| commit | cd952b405afd18a7c938b5c92e2e99f1c895e3f0 (patch) | |
| tree | aafc51b092e7e0d905502b003932bca5a0ad0c10 /set_soenv.in | |
| parent | 8bec619aefa8913e08f10878cd6ae98340e37e21 (diff) | |
Update the bundled version of OpenSSL from 0.9.8zh to 1.0.2h which
fixes many vulnerabiliies and adds support for newer, more secure
ciphers and versions of the protocol.
Note: OpenSSL version 1.0.2h contains two known minor vulnerabilites,
CVE-2016-2177 and CVE-2016-2178, which will be fixed in the next
OpenSSL release. Their potential impact is low enough that that
various Linux distros have chosen not to apply the upstream patches
to the versions that they distribute.
On Windows, there is an optional new dependency on NASM,
<http://www.nasm.us/>. If NASM is not available, then the C
implementations of the low-level crypto code will be used instead
of the optimized assembly language versions. Since OpenOffice is
not a heavy user of this code, the impact should be minor. If NASM
is installed, but its location is not in $PATH, the directory
containing nasm.exe should be passed to configure using --with-nasm-home.
The fallback to the C crypto implementation also happens on Linux
if the version of gcc is sufficently old to indicate that the
toolchain is likely to not support the some of the instructions in
the assembly language versions of the code.
Notes
Notes:
prefer: 7ecaf61287606001eac9b3d76df95a0a900e11c0
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index 502c46a182d9..52868de771f6 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -88,7 +88,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC, - $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH ); + $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NASM_PATH, $NSIS_PATH, $PERL_PATH ); # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, @@ -905,6 +905,11 @@ if ($platform =~ m/cygwin/) { $ASM_PATH = PathFormat('@ASM_HOME@'); } +# nasm.exe assembler path for Windows users. +if ($platform =~ m/cygwin/) +{ $NASM_PATH = PathFormat('@NASM_HOME@'); +} + # # E. Determining the envionment values based on the information # that was gathered earlier on. @@ -1210,6 +1215,9 @@ elsif ($platform =~ m/cygwin/) if ( $ASM_PATH ne "ASM_IN_PATH" ) { $PATH .= $ps.CygFormat($ASM_PATH); } + if ( $NASM_PATH ne "NASM_IN_PATH" && $NASM_PATH ne "NO_NASM_HOME" && $NASM_PATH ne "" ) + { $PATH .= $ps.CygFormat($NASM_PATH); + } # zip.exe / unzip.exe path for Windows users. my $zip_home_path = PathFormat('@ZIP_HOME@'); $tmppath = CygFormat($zip_home_path); @@ -1554,6 +1562,7 @@ ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); ToFile( "ANT", PathFormat("@ANT@"), "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); +ToFile( "NASM_PATH", $NASM_PATH, "e" ); ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); ToFile( "Empty", $empty, "n" ); |