142 lines
4.3 KiB
Diff
142 lines
4.3 KiB
Diff
|
--- ./crypto/seed/seed_ecb.c.mingw-header-files 2007-04-24 01:50:10.000000000 +0200
|
||
|
|
+++ ./crypto/seed/seed_ecb.c 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -49,7 +49,7 @@
|
||
|
|
*
|
||
|
|
*/
|
||
|
|
|
||
|
|
-#include <openssl/seed.h>
|
||
|
|
+#include "seed.h"
|
||
|
|
|
||
|
|
void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc)
|
||
|
|
{
|
||
|
|
--- ./crypto/seed/seed_locl.h.mingw-header-files 2009-02-02 18:28:48.000000000 +0100
|
||
|
|
+++ ./crypto/seed/seed_locl.h 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
#define HEADER_SEED_LOCL_H
|
||
|
|
|
||
|
|
#include "openssl/e_os2.h"
|
||
|
|
-#include <openssl/seed.h>
|
||
|
|
+#include "seed.h"
|
||
|
|
|
||
|
|
|
||
|
|
#ifdef SEED_LONG /* need 32-bit type */
|
||
|
|
--- ./crypto/seed/seed.c.mingw-header-files 2007-04-24 01:50:10.000000000 +0200
|
||
|
|
+++ ./crypto/seed/seed.c 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
#include <memory.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#include <openssl/seed.h>
|
||
|
|
+#include "seed.h"
|
||
|
|
#include "seed_locl.h"
|
||
|
|
|
||
|
|
static seed_word SS[4][256] = { {
|
||
|
|
--- ./crypto/camellia/cmll_cbc.c.mingw-header-files 2006-12-02 13:00:27.000000000 +0100
|
||
|
|
+++ ./crypto/camellia/cmll_cbc.c 2009-02-02 18:28:54.000000000 +0100
|
||
|
|
@@ -58,7 +58,7 @@
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
|
||
|
|
void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
|
||
|
|
--- ./crypto/camellia/cmll_cfb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200
|
||
|
|
+++ ./crypto/camellia/cmll_cfb.c 2009-02-02 18:28:54.000000000 +0100
|
||
|
|
@@ -113,7 +113,7 @@
|
||
|
|
#include <assert.h>
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
#include "e_os.h"
|
||
|
|
|
||
|
|
--- ./crypto/camellia/cmll_ofb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200
|
||
|
|
+++ ./crypto/camellia/cmll_ofb.c 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -111,7 +111,7 @@
|
||
|
|
# endif
|
||
|
|
#endif
|
||
|
|
#include <assert.h>
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
|
||
|
|
/* The input and output encrypted as though 128bit ofb mode is being
|
||
|
|
--- ./crypto/camellia/cmll_misc.c.mingw-header-files 2009-02-02 18:29:19.000000000 +0100
|
||
|
|
+++ ./crypto/camellia/cmll_misc.c 2009-02-02 18:29:32.000000000 +0100
|
||
|
|
@@ -50,7 +50,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
#include <openssl/crypto.h>
|
||
|
|
#ifdef OPENSSL_FIPS
|
||
|
|
--- ./crypto/camellia/cmll_ecb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200
|
||
|
|
+++ ./crypto/camellia/cmll_ecb.c 2009-02-02 18:28:54.000000000 +0100
|
||
|
|
@@ -56,7 +56,7 @@
|
||
|
|
#endif
|
||
|
|
#include <assert.h>
|
||
|
|
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
|
||
|
|
void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
|
||
|
|
--- ./crypto/camellia/cmll_ctr.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200
|
||
|
|
+++ ./crypto/camellia/cmll_ctr.c 2009-02-02 18:28:54.000000000 +0100
|
||
|
|
@@ -56,7 +56,7 @@
|
||
|
|
#endif
|
||
|
|
#include <assert.h>
|
||
|
|
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "camellia.h"
|
||
|
|
#include "cmll_locl.h"
|
||
|
|
|
||
|
|
/* NOTE: the IV/counter CTR mode is big-endian. The rest of the Camellia code
|
||
|
|
--- ./crypto/evp/e_seed.c.mingw-header-files 2007-07-04 14:56:32.000000000 +0200
|
||
|
|
+++ ./crypto/evp/e_seed.c 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -59,7 +59,7 @@
|
||
|
|
#include <string.h>
|
||
|
|
#include <assert.h>
|
||
|
|
#ifndef OPENSSL_NO_SEED
|
||
|
|
-#include <openssl/seed.h>
|
||
|
|
+#include "../seed/seed.h"
|
||
|
|
#include "evp_locl.h"
|
||
|
|
|
||
|
|
static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc);
|
||
|
|
--- ./crypto/evp/e_camellia.c.mingw-header-files 2008-09-21 12:24:08.000000000 +0200
|
||
|
|
+++ ./crypto/evp/e_camellia.c 2009-02-02 18:28:55.000000000 +0100
|
||
|
|
@@ -59,7 +59,7 @@
|
||
|
|
#include <openssl/err.h>
|
||
|
|
#include <string.h>
|
||
|
|
#include <assert.h>
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "../camellia/camellia.h"
|
||
|
|
#include "evp_locl.h"
|
||
|
|
|
||
|
|
static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
|
||
|
|
--- ./apps/speed.c.mingw-header-files 2009-01-07 11:48:22.000000000 +0100
|
||
|
|
+++ ./apps/speed.c 2009-02-02 18:28:54.000000000 +0100
|
||
|
|
@@ -165,7 +165,7 @@
|
||
|
|
#include <openssl/aes.h>
|
||
|
|
#endif
|
||
|
|
#ifndef OPENSSL_NO_CAMELLIA
|
||
|
|
-#include <openssl/camellia.h>
|
||
|
|
+#include "../crypto/camellia/camellia.h"
|
||
|
|
#endif
|
||
|
|
#ifndef OPENSSL_NO_MD2
|
||
|
|
#include <openssl/md2.h>
|
||
|
|
@@ -202,7 +202,7 @@
|
||
|
|
#include <openssl/idea.h>
|
||
|
|
#endif
|
||
|
|
#ifndef OPENSSL_NO_SEED
|
||
|
|
-#include <openssl/seed.h>
|
||
|
|
+#include "../crypto/seed/seed.h"
|
||
|
|
#endif
|
||
|
|
#ifndef OPENSSL_NO_BF
|
||
|
|
#include <openssl/blowfish.h>
|