openssl/mingw32-openssl-0.9.8g-header-files.patch

   1 Fix the location of certain header files.
   2
   3   - RWMJ 2008-09-30
   4
   5 diff -ur openssl-0.9.8g.orig/apps/speed.c openssl-0.9.8g.mingw/apps/speed.c
   6 --- openssl-0.9.8g.orig/apps/speed.c    2008-09-30 14:16:16.000000000 +0100
   7 +++ openssl-0.9.8g.mingw/apps/speed.c   2008-09-30 14:53:25.000000000 +0100
   8 @@ -165,7 +165,7 @@
   9  #include <openssl/aes.h>
  10  #endif
  11  #ifndef OPENSSL_NO_CAMELLIA
  12 -#include <openssl/camellia.h>
  13 +#include "../crypto/camellia/camellia.h"
  14  #endif
  15  #ifndef OPENSSL_NO_MD2
  16  #include <openssl/md2.h>
  17 @@ -202,7 +202,7 @@
  18  #include <openssl/idea.h>
  19  #endif
  20  #ifndef OPENSSL_NO_SEED
  21 -#include <openssl/seed.h>
  22 +#include "../crypto/seed/seed.h"
  23  #endif
  24  #ifndef OPENSSL_NO_BF
  25  #include <openssl/blowfish.h>
  26 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_cbc.c openssl-0.9.8g.mingw/crypto/camellia/cmll_cbc.c
  27 --- openssl-0.9.8g.orig/crypto/camellia/cmll_cbc.c      2006-12-02 12:00:27.000000000 +0000
  28 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_cbc.c     2008-09-30 14:29:02.000000000 +0100
  29 @@ -58,7 +58,7 @@
  30  #include <stdio.h>
  31  #include <string.h>
  32
  33 -#include <openssl/camellia.h>
  34 +#include "camellia.h"
  35  #include "cmll_locl.h"
  36
  37  void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
  38 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_cfb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_cfb.c
  39 --- openssl-0.9.8g.orig/crypto/camellia/cmll_cfb.c      2006-06-09 23:31:05.000000000 +0100
  40 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_cfb.c     2008-09-30 14:29:25.000000000 +0100
  41 @@ -113,7 +113,7 @@
  42  #include <assert.h>
  43  #include <string.h>
  44
  45 -#include <openssl/camellia.h>
  46 +#include "camellia.h"
  47  #include "cmll_locl.h"
  48  #include "e_os.h"
  49
  50 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ctr.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ctr.c
  51 --- openssl-0.9.8g.orig/crypto/camellia/cmll_ctr.c      2006-06-09 23:31:05.000000000 +0100
  52 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ctr.c     2008-09-30 14:29:36.000000000 +0100
  53 @@ -56,7 +56,7 @@
  54  #endif
  55  #include <assert.h>
  56
  57 -#include <openssl/camellia.h>
  58 +#include "camellia.h"
  59  #include "cmll_locl.h"
  60
  61  /* NOTE: the IV/counter CTR mode is big-endian.  The rest of the Camellia code
  62 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ecb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ecb.c
  63 --- openssl-0.9.8g.orig/crypto/camellia/cmll_ecb.c      2006-06-09 23:31:05.000000000 +0100
  64 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ecb.c     2008-09-30 14:28:50.000000000 +0100
  65 @@ -56,7 +56,7 @@
  66  #endif
  67  #include <assert.h>
  68
  69 -#include <openssl/camellia.h>
  70 +#include "camellia.h"
  71  #include "cmll_locl.h"
  72
  73  void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
  74 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_misc.c openssl-0.9.8g.mingw/crypto/camellia/cmll_misc.c
  75 --- openssl-0.9.8g.orig/crypto/camellia/cmll_misc.c     2007-01-21 13:16:21.000000000 +0000
  76 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_misc.c    2008-09-30 14:28:37.000000000 +0100
  77 @@ -50,7 +50,7 @@
  78   */
  79
  80  #include <openssl/opensslv.h>
  81 -#include <openssl/camellia.h>
  82 +#include "camellia.h"
  83  #include "cmll_locl.h"
  84
  85  const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
  86 diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ofb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ofb.c
  87 --- openssl-0.9.8g.orig/crypto/camellia/cmll_ofb.c      2006-06-09 23:31:05.000000000 +0100
  88 +++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ofb.c     2008-09-30 14:29:14.000000000 +0100
  89 @@ -111,7 +111,7 @@
  90  # endif
  91  #endif
  92  #include <assert.h>
  93 -#include <openssl/camellia.h>
  94 +#include "camellia.h"
  95  #include "cmll_locl.h"
  96
  97  /* The input and output encrypted as though 128bit ofb mode is being
  98 diff -ur openssl-0.9.8g.orig/crypto/evp/e_camellia.c openssl-0.9.8g.mingw/crypto/evp/e_camellia.c
  99 --- openssl-0.9.8g.orig/crypto/evp/e_camellia.c 2006-08-31 21:56:52.000000000 +0100
 100 +++ openssl-0.9.8g.mingw/crypto/evp/e_camellia.c        2008-09-30 14:31:31.000000000 +0100
 101 @@ -59,7 +59,7 @@
 102  #include <openssl/err.h>
 103  #include <string.h>
 104  #include <assert.h>
 105 -#include <openssl/camellia.h>
 106 +#include "../camellia/camellia.h"
 107  #include "evp_locl.h"
 108
 109  static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 110 diff -ur openssl-0.9.8g.orig/crypto/evp/e_seed.c openssl-0.9.8g.mingw/crypto/evp/e_seed.c
 111 --- openssl-0.9.8g.orig/crypto/evp/e_seed.c     2007-07-04 13:56:32.000000000 +0100
 112 +++ openssl-0.9.8g.mingw/crypto/evp/e_seed.c    2008-09-30 14:31:46.000000000 +0100
 113 @@ -59,7 +59,7 @@
 114  #include <string.h>
 115  #include <assert.h>
 116  #ifndef OPENSSL_NO_SEED
 117 -#include <openssl/seed.h>
 118 +#include "../seed/seed.h"
 119  #include "evp_locl.h"
 120
 121  static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,        const unsigned char *iv, int enc);
 122 diff -ur openssl-0.9.8g.orig/crypto/seed/seed.c openssl-0.9.8g.mingw/crypto/seed/seed.c
 123 --- openssl-0.9.8g.orig/crypto/seed/seed.c      2007-04-24 00:50:10.000000000 +0100
 124 +++ openssl-0.9.8g.mingw/crypto/seed/seed.c     2008-09-30 14:29:58.000000000 +0100
 125 @@ -32,7 +32,7 @@
 126  #include <memory.h>
 127  #endif
 128
 129 -#include <openssl/seed.h>
 130 +#include "seed.h"
 131  #include "seed_locl.h"
 132
 133  static seed_word SS[4][256] = {        {
 134 diff -ur openssl-0.9.8g.orig/crypto/seed/seed_ecb.c openssl-0.9.8g.mingw/crypto/seed/seed_ecb.c
 135 --- openssl-0.9.8g.orig/crypto/seed/seed_ecb.c  2007-04-24 00:50:10.000000000 +0100
 136 +++ openssl-0.9.8g.mingw/crypto/seed/seed_ecb.c 2008-09-30 14:30:21.000000000 +0100
 137 @@ -49,7 +49,7 @@
 138   *
 139   */
 140
 141 -#include <openssl/seed.h>
 142 +#include "seed.h"
 143
 144  void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc)
 145         {
 146 diff -ur openssl-0.9.8g.orig/crypto/seed/seed_locl.h openssl-0.9.8g.mingw/crypto/seed/seed_locl.h
 147 --- openssl-0.9.8g.orig/crypto/seed/seed_locl.h 2008-09-30 14:16:15.000000000 +0100
 148 +++ openssl-0.9.8g.mingw/crypto/seed/seed_locl.h        2008-09-30 14:30:10.000000000 +0100
 149 @@ -27,7 +27,7 @@
 150  #define HEADER_SEED_LOCL_H
 151
 152  #include "openssl/e_os2.h"
 153 -#include <openssl/seed.h>
 154 +#include "seed.h"
 155
 156
 157  #ifdef SEED_LONG /* need 32-bit type */