1 Fix the location of certain header files.
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
9 #include <openssl/aes.h>
11 #ifndef OPENSSL_NO_CAMELLIA
12 -#include <openssl/camellia.h>
13 +#include "../crypto/camellia/camellia.h"
15 #ifndef OPENSSL_NO_MD2
16 #include <openssl/md2.h>
18 #include <openssl/idea.h>
20 #ifndef OPENSSL_NO_SEED
21 -#include <openssl/seed.h>
22 +#include "../crypto/seed/seed.h"
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
33 -#include <openssl/camellia.h>
34 +#include "camellia.h"
35 #include "cmll_locl.h"
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
45 -#include <openssl/camellia.h>
46 +#include "camellia.h"
47 #include "cmll_locl.h"
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
57 -#include <openssl/camellia.h>
58 +#include "camellia.h"
59 #include "cmll_locl.h"
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
69 -#include <openssl/camellia.h>
70 +#include "camellia.h"
71 #include "cmll_locl.h"
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
80 #include <openssl/opensslv.h>
81 -#include <openssl/camellia.h>
82 +#include "camellia.h"
83 #include "cmll_locl.h"
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
93 -#include <openssl/camellia.h>
94 +#include "camellia.h"
95 #include "cmll_locl.h"
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
102 #include <openssl/err.h>
105 -#include <openssl/camellia.h>
106 +#include "../camellia/camellia.h"
107 #include "evp_locl.h"
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
116 #ifndef OPENSSL_NO_SEED
117 -#include <openssl/seed.h>
118 +#include "../seed/seed.h"
119 #include "evp_locl.h"
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
129 -#include <openssl/seed.h>
131 #include "seed_locl.h"
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
141 -#include <openssl/seed.h>
144 void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc)
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
150 #define HEADER_SEED_LOCL_H
152 #include "openssl/e_os2.h"
153 -#include <openssl/seed.h>
157 #ifdef SEED_LONG /* need 32-bit type */