diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-03 20:48:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-03 20:48:20 +0000 |
| commit | 4039bec2f465b8d66f79c6d69de64b43147cda9a (patch) | |
| tree | 260a5e4886289e855d428d67c5b9f3cb9a746b2b /openssl/openssl.patch | |
| parent | 55aa942c51c728a9bb749a9732c9b99935be0a55 (diff) | |
CWS-TOOLING: integrate CWS tkr21_DEV300
2009-03-30 13:45:59 +0200 tkr r270224 : #i100606# openssl upgrade to 0.9.8k. (security fixes)
Diffstat (limited to 'openssl/openssl.patch')
| -rw-r--r-- | openssl/openssl.patch | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 3761ba5390be..ed475400e2e0 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8g/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 -+++ misc/build/openssl-0.9.8g/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100 +--- misc/openssl-0.9.8k/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 ++++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (richard@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * ---- misc/openssl-0.9.8g/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 -+++ misc/build/openssl-0.9.8g/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100 +--- misc/openssl-0.9.8k/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 ++++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (richard@levitte.org) @@ -20,8 +20,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * ---- misc/openssl-0.9.8g/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200 -+++ misc/build/openssl-0.9.8g/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100 +--- misc/openssl-0.9.8k/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200 ++++ misc/build/openssl-0.9.8k/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100 @@ -1,9 +1,8 @@ +%1 util\mkfiles.pl >MINFO +%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak @@ -39,8 +39,8 @@ -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def +%1 util\mkdef.pl 32 libeay > ms\libeay32.def +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def ---- misc/openssl-0.9.8g/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200 -+++ misc/build/openssl-0.9.8g/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100 +--- misc/openssl-0.9.8k/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200 ++++ misc/build/openssl-0.9.8k/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100 @@ -115,7 +115,7 @@ $inc_def="outinc"; $tmp_def="tmp"; @@ -59,9 +59,9 @@ #define PLATFORM "$platform" EOF printf OUT " #define DATE \"%s\"\n", scalar gmtime(); ---- misc/openssl-0.9.8g/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200 -+++ misc/build/openssl-0.9.8g/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100 -@@ -14,7 +14,7 @@ +--- misc/openssl-0.9.8k/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200 ++++ misc/build/openssl-0.9.8k/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100 +@@ -28,7 +28,7 @@ $zlib_lib="zlib1.lib"; # C compiler stuff @@ -70,7 +70,7 @@ if ($FLAVOR =~ /WIN64/) { # Note that we currently don't have /WX on Win64! There is a lot of -@@ -83,19 +83,19 @@ +@@ -99,21 +99,21 @@ } $cc='$(CC)'; @@ -89,14 +89,18 @@ + $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- $opt_cflags=' /MD /Ox /O2 /Ob2'; -- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; -+ $opt_cflags=' -MD -Ox -O2 -Ob2'; -+ $dbg_cflags=' -MDd -Od -DDEBUG -D_DEBUG'; +- my $f = $shlib || $fips ?' /MD':' /MT'; ++ my $f = $shlib || $fips ?' -MD':' -MT'; +- $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib ++ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib +- $opt_cflags=$f.' /Ox /O2 /Ob2'; +- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; ++ $opt_cflags=$f.' -Ox -O2 -Ob2'; ++ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; } $mlflags=''; -@@ -116,7 +116,7 @@ +@@ -134,7 +134,7 @@ } $obj='.obj'; @@ -105,7 +109,7 @@ # EXE linking stuff $link="link"; -@@ -240,7 +240,7 @@ +@@ -281,7 +281,7 @@ $tmp_def='tmp32dll_$(TARGETCPU)'; } |