openssl/opensslwnt.patch

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