openwrt/package/openssl/patches/openssl.patch

   1 diff -Nur openssl-0.9.7f/Configure openssl-0.9.7f.new/Configure
   2 --- openssl-0.9.7f/Configure    2005-03-12 12:28:21.000000000 +0100
   3 +++ openssl-0.9.7f.new/Configure        2005-04-03 20:32:00.000000000 +0200
   4 @@ -1,4 +1,4 @@
   5 -:
   6 +#!/usr/bin/perl
   7  eval 'exec perl -S $0 ${1+"$@"}'
   8      if $running_under_some_shell;
   9  ##
  10 diff -Nur openssl-0.9.7f/include/openssl/opensslconf.h openssl-0.9.7f.new/include/openssl/opensslconf.h
  11 --- openssl-0.9.7f/include/openssl/opensslconf.h        2005-03-22 20:18:28.000000000 +0100
  12 +++ openssl-0.9.7f.new/include/openssl/opensslconf.h    2005-04-03 20:38:09.000000000 +0200
  13 @@ -4,17 +4,38 @@
  14  /* OpenSSL was configured with the following options: */
  15  #ifndef OPENSSL_DOING_MAKEDEPEND
  16
  17 +#ifndef OPENSSL_NO_IDEA
  18 +# define OPENSSL_NO_IDEA
  19 +#endif
  20 +#ifndef OPENSSL_NO_MDC2
  21 +# define OPENSSL_NO_MDC2
  22 +#endif
  23 +#ifndef OPENSSL_NO_RC5
  24 +# define OPENSSL_NO_RC5
  25 +#endif
  26  #ifndef OPENSSL_NO_KRB5
  27  # define OPENSSL_NO_KRB5
  28  #endif
  29
  30  #endif /* OPENSSL_DOING_MAKEDEPEND */
  31 +#ifndef OPENSSL_THREADS
  32 +# define OPENSSL_THREADS
  33 +#endif
  34
  35  /* The OPENSSL_NO_* macros are also defined as NO_* if the application
  36     asks for it.  This is a transient feature that is provided for those
  37     who haven't had the time to do the appropriate changes in their
  38     applications.  */
  39  #ifdef OPENSSL_ALGORITHM_DEFINES
  40 +# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
  41 +#  define NO_IDEA
  42 +# endif
  43 +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
  44 +#  define NO_MDC2
  45 +# endif
  46 +# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
  47 +#  define NO_RC5
  48 +# endif
  49  # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
  50  #  define NO_KRB5
  51  # endif
  52 @@ -27,7 +48,7 @@
  53
  54  #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
  55  #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
  56 -#define OPENSSLDIR "/usr/local/ssl"
  57 +#define OPENSSLDIR "/usr/lib/ssl"
  58  #endif
  59  #endif
  60
  61 @@ -79,7 +100,7 @@
  62
  63  #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
  64  #define CONFIG_HEADER_BN_H
  65 -#undef BN_LLONG
  66 +#defne BN_LLONG
  67
  68  /* Should we define BN_DIV2W here? */
  69
  70 @@ -98,7 +119,7 @@
  71  #define CONFIG_HEADER_RC4_LOCL_H
  72  /* if this is defined data[i] is used instead of *data, this is a %20
  73   * speedup on x86 */
  74 -#undef RC4_INDEX
  75 +#define RC4_INDEX
  76  #endif
  77
  78  #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
  79 @@ -112,14 +133,14 @@
  80  /* the following is tweaked from a config script, that is why it is a
  81   * protected undef/define */
  82  #ifndef DES_PTR
  83 -#undef DES_PTR
  84 +#define DES_PTR
  85  #endif
  86
  87  /* This helps C compiler generate the correct code for multiple functional
  88   * units.  It reduces register dependancies at the expense of 2 more
  89   * registers */
  90  #ifndef DES_RISC1
  91 -#undef DES_RISC1
  92 +#define DES_RISC1
  93  #endif
  94
  95  #ifndef DES_RISC2
  96 @@ -133,7 +154,7 @@
  97  /* Unroll the inner loop, this sometimes helps, sometimes hinders.
  98   * Very mucy CPU dependant */
  99  #ifndef DES_UNROLL
 100 -#undef DES_UNROLL
 101 +#define DES_UNROLL
 102  #endif
 103
 104  /* These default values were supplied by
 105 diff -Nur openssl-0.9.7f/ssl/ssl_algs.c openssl-0.9.7f.new/ssl/ssl_algs.c
 106 --- openssl-0.9.7f/ssl/ssl_algs.c       2001-02-20 09:11:58.000000000 +0100
 107 +++ openssl-0.9.7f.new/ssl/ssl_algs.c   2005-04-03 20:40:27.000000000 +0200
 108 @@ -109,3 +109,9 @@
 109         return(1);
 110         }
 111
 112 +#undef SSLeay_add_ssl_algorithms
 113 +int SSLeay_add_ssl_algorithms(void)
 114 +    {
 115 +         return SSL_library_init();
 116 +    }
 117 +
 118 diff -Nur openssl-0.9.7f/tools/c_rehash.in openssl-0.9.7f.new/tools/c_rehash.in
 119 --- openssl-0.9.7f/tools/c_rehash.in    2002-10-11 22:35:45.000000000 +0200
 120 +++ openssl-0.9.7f.new/tools/c_rehash.in        2005-04-03 20:41:17.000000000 +0200
 121 @@ -1,4 +1,4 @@
 122 -#!/usr/local/bin/perl
 123 +#!/usr/bin/perl
 124
 125
 126  # Perl c_rehash script, scan all files in a directory
 127 diff -Nur openssl-0.9.7f/util/clean-depend.pl openssl-0.9.7f.new/util/clean-depend.pl
 128 --- openssl-0.9.7f/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200
 129 +++ openssl-0.9.7f.new/util/clean-depend.pl     2005-04-03 20:41:38.000000000 +0200
 130 @@ -1,4 +1,4 @@
 131 -#!/usr/local/bin/perl -w
 132 +#!/usr/bin/perl -w
 133  # Clean the dependency list in a makefile of standard includes...
 134  # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
 135
 136 diff -Nur openssl-0.9.7f/util/mkdef.pl openssl-0.9.7f.new/util/mkdef.pl
 137 --- openssl-0.9.7f/util/mkdef.pl        2005-02-05 18:19:23.000000000 +0100
 138 +++ openssl-0.9.7f.new/util/mkdef.pl    2005-04-03 20:42:49.000000000 +0200
 139 @@ -1,4 +1,4 @@
 140 -#!/usr/local/bin/perl -w
 141 +#!/usr/bin/perl
 142  #
 143  # generate a .def file
 144  #
 145 diff -Nur openssl-0.9.7f/util/mkerr.pl openssl-0.9.7f.new/util/mkerr.pl
 146 --- openssl-0.9.7f/util/mkerr.pl        2005-01-31 02:28:17.000000000 +0100
 147 +++ openssl-0.9.7f.new/util/mkerr.pl    2005-04-03 20:43:02.000000000 +0200
 148 @@ -1,4 +1,4 @@
 149 -#!/usr/local/bin/perl -w
 150 +#!/usr/bin/perl
 151
 152  my $config = "crypto/err/openssl.ec";
 153  my $debug = 0;
 154 diff -Nur openssl-0.9.7f/util/mkstack.pl openssl-0.9.7f.new/util/mkstack.pl
 155 --- openssl-0.9.7f/util/mkstack.pl      2004-10-04 18:27:36.000000000 +0200
 156 +++ openssl-0.9.7f.new/util/mkstack.pl  2005-04-03 20:43:18.000000000 +0200
 157 @@ -1,4 +1,4 @@
 158 -#!/usr/local/bin/perl -w
 159 +#!/usr/bin/perl
 160
 161  # This is a utility that searches out "DECLARE_STACK_OF()"
 162  # declarations in .h and .c files, and updates/creates/replaces
 163 diff -Nur openssl-0.9.7f/util/pod2man.pl openssl-0.9.7f.new/util/pod2man.pl
 164 --- openssl-0.9.7f/util/pod2man.pl      2002-05-30 17:30:21.000000000 +0200
 165 +++ openssl-0.9.7f.new/util/pod2man.pl  2005-04-03 20:43:52.000000000 +0200
 166 @@ -1,4 +1,4 @@
 167 -: #!/usr/bin/perl-5.005
 168 +#!/usr/bin/perl
 169      eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
 170         if $running_under_some_shell;
 171
 172 diff -Nur openssl-0.9.7f/util/selftest.pl openssl-0.9.7f.new/util/selftest.pl
 173 --- openssl-0.9.7f/util/selftest.pl     2004-05-11 14:46:19.000000000 +0200
 174 +++ openssl-0.9.7f.new/util/selftest.pl 2005-04-03 20:44:10.000000000 +0200
 175 @@ -1,4 +1,4 @@
 176 -#!/usr/local/bin/perl -w
 177 +#!/usr/bin/perl
 178  #
 179  # Run the test suite and generate a report
 180  #