1*cdf0e10cSrcweir--- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 2*cdf0e10cSrcweir+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 3*cdf0e10cSrcweir@@ -2,7 +2,7 @@ 4*cdf0e10cSrcweir /* Contributed to the OpenSSL Project 2004 5*cdf0e10cSrcweir * by Richard Levitte (richard@levitte.org) 6*cdf0e10cSrcweir */ 7*cdf0e10cSrcweir-/* Copyright (c) 2004 Kungliga Tekniska H�gskolan 8*cdf0e10cSrcweir+/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan 9*cdf0e10cSrcweir * (Royal Institute of Technology, Stockholm, Sweden). 10*cdf0e10cSrcweir * All rights reserved. 11*cdf0e10cSrcweir * 12*cdf0e10cSrcweir--- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 13*cdf0e10cSrcweir+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 14*cdf0e10cSrcweir@@ -2,7 +2,7 @@ 15*cdf0e10cSrcweir /* Contributed to the OpenSSL Project 2004 16*cdf0e10cSrcweir * by Richard Levitte (richard@levitte.org) 17*cdf0e10cSrcweir */ 18*cdf0e10cSrcweir-/* Copyright (c) 2004 Kungliga Tekniska H�gskolan 19*cdf0e10cSrcweir+/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan 20*cdf0e10cSrcweir * (Royal Institute of Technology, Stockholm, Sweden). 21*cdf0e10cSrcweir * All rights reserved. 22*cdf0e10cSrcweir * 23*cdf0e10cSrcweir--- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200 24*cdf0e10cSrcweir+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 25*cdf0e10cSrcweir@@ -1,11 +1,11 @@ 26*cdf0e10cSrcweir 27*cdf0e10cSrcweir-perl util\mkfiles.pl >MINFO 28*cdf0e10cSrcweir-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak 29*cdf0e10cSrcweir-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak 30*cdf0e10cSrcweir+%1 util\mkfiles.pl >MINFO 31*cdf0e10cSrcweir+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak 32*cdf0e10cSrcweir+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak 33*cdf0e10cSrcweir if x%OSVERSION% == x goto skipce 34*cdf0e10cSrcweir-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak 35*cdf0e10cSrcweir-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak 36*cdf0e10cSrcweir+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak 37*cdf0e10cSrcweir+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak 38*cdf0e10cSrcweir :skipce 39*cdf0e10cSrcweir 40*cdf0e10cSrcweir-perl util\mkdef.pl 32 libeay > ms\libeay32.def 41*cdf0e10cSrcweir-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def 42*cdf0e10cSrcweir+%1 util\mkdef.pl 32 libeay > ms\libeay32.def 43*cdf0e10cSrcweir+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def 44*cdf0e10cSrcweir--- misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200 45*cdf0e10cSrcweir+++ misc/build/openssl-0.9.8o/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100 46*cdf0e10cSrcweir@@ -128,7 +128,7 @@ 47*cdf0e10cSrcweir $inc_def="outinc"; 48*cdf0e10cSrcweir $tmp_def="tmp"; 49*cdf0e10cSrcweir 50*cdf0e10cSrcweir-$perl="perl" unless defined $perl; 51*cdf0e10cSrcweir+$perl="$ENV{PERL}" unless defined $perl; 52*cdf0e10cSrcweir $mkdir="-mkdir" unless defined $mkdir; 53*cdf0e10cSrcweir 54*cdf0e10cSrcweir ($ssl,$crypto)=("ssl","crypto"); 55*cdf0e10cSrcweir@@ -290,6 +290,11 @@ 56*cdf0e10cSrcweir chop; 57*cdf0e10cSrcweir 58*cdf0e10cSrcweir ($key,$val)=/^([^=]+)=(.*)/; 59*cdf0e10cSrcweir+ 60*cdf0e10cSrcweir+ # On some Windows machines, $val has linefeeds at the end, which confuses 61*cdf0e10cSrcweir+ # subsequent code in this file. So we strip all whitespace at the end. 62*cdf0e10cSrcweir+ $val =~ s/\s+$//; 63*cdf0e10cSrcweir+ 64*cdf0e10cSrcweir if ($key eq "RELATIVE_DIRECTORY") 65*cdf0e10cSrcweir { 66*cdf0e10cSrcweir if ($lib ne "") 67*cdf0e10cSrcweir@@ -730,7 +735,7 @@ 68*cdf0e10cSrcweir printf OUT <<EOF; 69*cdf0e10cSrcweir #ifdef $platform_cpp_symbol 70*cdf0e10cSrcweir /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */ 71*cdf0e10cSrcweir- #define CFLAGS "$cc $cflags" 72*cdf0e10cSrcweir+ #define CFLAGS "$cflags" 73*cdf0e10cSrcweir #define PLATFORM "$platform" 74*cdf0e10cSrcweir EOF 75*cdf0e10cSrcweir printf OUT " #define DATE \"%s\"\n", scalar gmtime(); 76*cdf0e10cSrcweir--- misc/openssl-0.9.8o/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100 77*cdf0e10cSrcweir+++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100 78*cdf0e10cSrcweir@@ -32,7 +32,7 @@ 79*cdf0e10cSrcweir $l_flags =~ s/-L(\S+)/\/libpath:$1/g; 80*cdf0e10cSrcweir 81*cdf0e10cSrcweir # C compiler stuff 82*cdf0e10cSrcweir-$cc='cl'; 83*cdf0e10cSrcweir+$cc=$ENV{'CC'}; 84*cdf0e10cSrcweir if ($FLAVOR =~ /WIN64/) 85*cdf0e10cSrcweir { 86*cdf0e10cSrcweir # Note that we currently don't have /WX on Win64! There is a lot of 87*cdf0e10cSrcweir@@ -103,21 +103,21 @@ 88*cdf0e10cSrcweir } 89*cdf0e10cSrcweir 90*cdf0e10cSrcweir $cc='$(CC)'; 91*cdf0e10cSrcweir- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; 92*cdf0e10cSrcweir+ $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; 93*cdf0e10cSrcweir $base_cflags.=" $wcecdefs"; 94*cdf0e10cSrcweir- $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... 95*cdf0e10cSrcweir- $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; 96*cdf0e10cSrcweir+ $opt_cflags=' -MC -O1i'; # optimize for space, but with intrinsics... 97*cdf0e10cSrcweir+ $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG'; 98*cdf0e10cSrcweir $lflags="/nologo /opt:ref $wcelflag"; 99*cdf0e10cSrcweir } 100*cdf0e10cSrcweir else # Win32 101*cdf0e10cSrcweir { 102*cdf0e10cSrcweir- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; 103*cdf0e10cSrcweir+ $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; 104*cdf0e10cSrcweir $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 105*cdf0e10cSrcweir $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 106*cdf0e10cSrcweir- my $f = $shlib || $fips ?' /MD':' /MT'; 107*cdf0e10cSrcweir- $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib 108*cdf0e10cSrcweir- $opt_cflags=$f.' /Ox /O2 /Ob2'; 109*cdf0e10cSrcweir- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; 110*cdf0e10cSrcweir+ my $f = $shlib || $fips ?' -MD':' -MT'; 111*cdf0e10cSrcweir+ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib 112*cdf0e10cSrcweir+ $opt_cflags=$f.' -Ox -O2 -Ob2'; 113*cdf0e10cSrcweir+ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG'; 114*cdf0e10cSrcweir $lflags="/nologo /subsystem:console /opt:ref"; 115*cdf0e10cSrcweir } 116*cdf0e10cSrcweir $mlflags=''; 117*cdf0e10cSrcweir@@ -138,7 +138,7 @@ 118*cdf0e10cSrcweir } 119*cdf0e10cSrcweir 120*cdf0e10cSrcweir $obj='.obj'; 121*cdf0e10cSrcweir-$ofile="/Fo"; 122*cdf0e10cSrcweir+$ofile="-Fo.\\"; 123*cdf0e10cSrcweir 124*cdf0e10cSrcweir # EXE linking stuff 125*cdf0e10cSrcweir $link="link"; 126*cdf0e10cSrcweir@@ -298,7 +298,7 @@ 127*cdf0e10cSrcweir $tmp_def='tmp32dll_$(TARGETCPU)'; 128*cdf0e10cSrcweir } 129*cdf0e10cSrcweir 130*cdf0e10cSrcweir-$cflags.=" /Fd$out_def"; 131*cdf0e10cSrcweir+$cflags.=" -Fd$out_def"; 132*cdf0e10cSrcweir 133*cdf0e10cSrcweir sub do_lib_rule 134*cdf0e10cSrcweir { 135