More #include fiddles.

Add python/system.h to insure python included before any glibc includes.

CVS patchset: 7377
CVS date: 2004/08/02 03:30:10

diff --git a/beecrypt/aes.c b/beecrypt/aes.c
index 959f0fc..a1e1314 100644 (file)
--- a/beecrypt/aes.c
+++ b/beecrypt/aes.c
@@ -29,7 +29,10 @@
 
 #include "system.h"
 
+#include "beecrypt.h"
+#include "aesopt.h"
 #include "aes.h"
+#include "mp.h"
 
 #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && defined(LITTLE_ENDIAN)
 # if (BYTE_ORDER != BIG_ENDIAN) && (BYTE_ORDER != LITTLE_ENDIAN)

diff --git a/beecrypt/aes.h b/beecrypt/aes.h
index 5051223..f265c10 100644 (file)
--- a/beecrypt/aes.h
+++ b/beecrypt/aes.h
@@ -26,8 +26,8 @@
 #ifndef _AES_H
 #define _AES_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/aesopt.h"
+#include "beecrypt.h"
+#include "aesopt.h"
 
 /*!\brief Holds all the parameters necessary for the AES cipher.
  * \ingroup BC_aes_m

diff --git a/beecrypt/aesopt.h b/beecrypt/aesopt.h
index 10abae4..19a526b 100644 (file)
--- a/beecrypt/aesopt.h
+++ b/beecrypt/aesopt.h
@@ -26,8 +26,8 @@
 #ifndef _AESOPT_H
 #define _AESOPT_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/aes.h"
+#include "beecrypt.h"
+#include "aes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/base64.h b/beecrypt/base64.h
index 16ed450..43ed185 100644 (file)
--- a/beecrypt/base64.h
+++ b/beecrypt/base64.h
@@ -25,7 +25,7 @@
 #ifndef _BASE64_H
 #define _BASE64_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 /*!\
  * Decode white space character set (default).

diff --git a/beecrypt/beecrypt.c b/beecrypt/beecrypt.c
index 1a7a1b3..5e1517f 100644 (file)
--- a/beecrypt/beecrypt.c
+++ b/beecrypt/beecrypt.c
@@ -27,17 +27,15 @@
 #include "beecrypt.h"
 
 #include "entropy.h"
-
 #include "fips186.h"
-#include "mtprng.h"
-
-#include "md5.h"
-#include "sha1.h"
-#include "sha256.h"
-
 #include "hmacmd5.h"
 #include "hmacsha1.h"
 #include "hmacsha256.h"
+#include "md5.h"
+#include "mp.h"
+#include "mtprng.h"
+#include "sha1.h"
+#include "sha256.h"
 
 #include "aes.h"
 #include "blowfish.h"

diff --git a/beecrypt/beecrypt.h b/beecrypt/beecrypt.h
index f383267..54fb51f 100644 (file)
--- a/beecrypt/beecrypt.h
+++ b/beecrypt/beecrypt.h
@@ -30,10 +30,11 @@
 #ifndef _BEECRYPT_H
 #define _BEECRYPT_H
 
-#include "beecrypt/api.h"
-
-#include "beecrypt/memchunk.h"
-#include "beecrypt/mpnumber.h"
+#include "api.h"
+                                                                                
+#include "memchunk.h"
+#include "mpnumber.h"
+#include "mp.h"
 
 /*
  * Entropy Sources

diff --git a/beecrypt/beecrypt.win.h b/beecrypt/beecrypt.win.h
deleted file mode 100644 (file)
index 234384d..0000000
--- a/beecrypt/beecrypt.win.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-/*!\file beecrypt.win.h
- * \brief BeeCrypt API, windows headers.
- * \author Bob Deblier <bob.deblier@pandora.be>
- */
-
-#ifndef _BEECRYPT_WIN_H
-#define _BEECRYPT_WIN_H
-
-#define _REENTRANT
-
-#if !defined(_WIN32_WINNT)
-#define _WIN32_WINNT 0x0400
-#endif
-
-#include <windows.h>
-
-#if __MWERKS__
-# if __INTEL__
-#  define WORDS_BIGENDIAN              0
-# else
-#  error Unknown CPU type in MetroWerks CodeWarrior
-# endif
-#elif defined(_MSC_VER)
-# if defined(_M_IX86)
-#  define WORDS_BIGENDIAN              0
-#  define ROTL32(x, s) _rotl(x, s)
-#  define ROTR32(x, s) _rotr(x, s)
-# else
-#  error Unknown CPU type in Microsoft Visual C
-# endif
-#else
-# error Unknown compiler for WIN32
-#endif
-
-#if defined(_MSC_VER) || __MWERKS__
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define HAVE_ERRNO_H                   1
-#define HAVE_CTYPE_H                   1
-#define HAVE_FCNTL_H                   1
-#define HAVE_TIME_H                            1
-
-#define HAVE_SYS_TYPES_H               0
-#define HAVE_SYS_TIME_H                        0
-
-#define HAVE_THREAD_H                  0
-#define HAVE_SYNCH_H                   0
-#define HAVE_PTHREAD_H                 0
-#define HAVE_SEMAPHORE_H               0
-
-#define HAVE_TERMIO_H                  0
-#define HAVE_SYS_AUDIOIO_H             0
-#define HAVE_SYS_IOCTL_H               0
-#define HAVE_SYS_SOUNDCARD_H   0
-
-#define HAVE_GETTIMEOFDAY              0
-#define HAVE_GETHRTIME                 0
-
-#define HAVE_DEV_TTY                   0
-#define HAVE_DEV_AUDIO                 0
-#define HAVE_DEV_DSP                   0
-#define HAVE_DEV_RANDOM                        0
-#define HAVE_DEV_URANDOM               0
-#define HAVE_DEV_TTY                   0
-
-#else
-#error Not set up for this compiler
-#endif
-
-#if __MWERKS__
-#define HAVE_SYS_STAT_H                        0
-
-#define HAVE_LONG_LONG                 1
-#define HAVE_UNSIGNED_LONG_LONG        1
-
-#define HAVE_64_BIT_INT                        1
-#define HAVE_64_BIT_UINT               1
-
-typedef char           int8_t;
-typedef short          int16_t;
-typedef long           int32_t;
-typedef long long      int64_t;
-
-typedef unsigned char          uint8_t;
-typedef unsigned short         uint16_t;
-typedef unsigned long          uint32_t;
-typedef unsigned long long     uint64_t;
-
-#elif defined(_MSC_VER)
-#define HAVE_SYS_STAT_H                        1
-
-#define HAVE_LONG_LONG                 0
-#define HAVE_UNSIGNED_LONG_LONG        0
-
-#define HAVE_64_BIT_INT                        1
-#define HAVE_64_BIT_UINT               1
-
-typedef __int8 int8_t;
-typedef __int16        int16_t;
-typedef __int32        int32_t;
-typedef __int64        int64_t;
-
-typedef unsigned __int8                uint8_t;
-typedef unsigned __int16       uint16_t;
-typedef unsigned __int32       uint32_t;
-typedef unsigned __int64       uint64_t;
-
-#endif
-
-#define MP_WBITS       32U
-
-#endif

diff --git a/beecrypt/blockmode.c b/beecrypt/blockmode.c
index 6ec12c9..41423c1 100644 (file)
--- a/beecrypt/blockmode.c
+++ b/beecrypt/blockmode.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "blockmode.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/blockmode.h b/beecrypt/blockmode.h
index 4f21b81..a54e2b8 100644 (file)
--- a/beecrypt/blockmode.h
+++ b/beecrypt/blockmode.h
@@ -27,7 +27,7 @@
 #ifndef _BLOCKMODE_H
 #define _BLOCKMODE_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/blockpad.h b/beecrypt/blockpad.h
index da382bc..2a18058 100644 (file)
--- a/beecrypt/blockpad.h
+++ b/beecrypt/blockpad.h
@@ -26,7 +26,7 @@
 #ifndef _BLOCKPAD_H
 #define _BLOCKPAD_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/blowfish.c b/beecrypt/blowfish.c
index 6611d13..fe4b78b 100644 (file)
--- a/beecrypt/blowfish.c
+++ b/beecrypt/blowfish.c
@@ -25,6 +25,8 @@
 
 #include "system.h"
 
+#include "beecrypt.h"
+#include "blowfishopt.h"
 #include "blowfish.h"
 #include "endianness.h"
 

diff --git a/beecrypt/blowfish.h b/beecrypt/blowfish.h
index d8f752f..a3efb37 100644 (file)
--- a/beecrypt/blowfish.h
+++ b/beecrypt/blowfish.h
@@ -34,8 +34,8 @@
 #ifndef _BLOWFISH_H
 #define _BLOWFISH_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/blowfishopt.h"
+#include "beecrypt.h"
+#include "blowfishopt.h"
 
 #define BLOWFISHROUNDS 16
 #define BLOWFISHPSIZE  (BLOWFISHROUNDS+2)

diff --git a/beecrypt/blowfishopt.h b/beecrypt/blowfishopt.h
index 2150a43..27a229a 100644 (file)
--- a/beecrypt/blowfishopt.h
+++ b/beecrypt/blowfishopt.h
@@ -26,8 +26,8 @@
 #ifndef _BLOWFISHOPT_H
 #define _BLOWFISHOPT_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/blowfish.h"
+#include "beecrypt.h"
+#include "blowfish.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/dhaes.h b/beecrypt/dhaes.h
index 3816d99..8a35001 100644 (file)
--- a/beecrypt/dhaes.h
+++ b/beecrypt/dhaes.h
@@ -32,10 +32,10 @@
 
 #ifndef _DHAES_H
 #define _DHAES_H
- 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/dldp.h"
 
+#include "beecrypt.h"
+#include "dldp.h"
+ 
 typedef struct
 {
        const dldp_p*                           param;

diff --git a/beecrypt/dldp.h b/beecrypt/dldp.h
index d19eefe..b959295 100644 (file)
--- a/beecrypt/dldp.h
+++ b/beecrypt/dldp.h
@@ -26,7 +26,7 @@
 #ifndef _DLDP_H
 #define _DLDP_H
 
-#include "beecrypt/mpbarrett.h"
+#include "mpbarrett.h"
 
 /*
  * Discrete Logarithm Domain Parameters - Prime

diff --git a/beecrypt/dlkp.h b/beecrypt/dlkp.h
index 2629073..c03329b 100644 (file)
--- a/beecrypt/dlkp.h
+++ b/beecrypt/dlkp.h
@@ -26,7 +26,7 @@
 #ifndef _DLKP_H
 #define _DLKP_H
 
-#include "beecrypt/dlpk.h"
+#include "dlpk.h"
 
 /*!\ingroup DL_m
  */

diff --git a/beecrypt/dlpk.c b/beecrypt/dlpk.c
index 2efc83a..8ce645a 100644 (file)
--- a/beecrypt/dlpk.c
+++ b/beecrypt/dlpk.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "dlpk.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/dlpk.h b/beecrypt/dlpk.h
index e91f623..152671e 100644 (file)
--- a/beecrypt/dlpk.h
+++ b/beecrypt/dlpk.h
@@ -26,7 +26,7 @@
 #ifndef _DLPK_H
 #define _DLPK_H
 
-#include "beecrypt/dldp.h"
+#include "dldp.h"
 
 /*!\ingroup DL_m
  */

diff --git a/beecrypt/dlsvdp-dh.h b/beecrypt/dlsvdp-dh.h
index 19d989e..64c30fb 100644 (file)
--- a/beecrypt/dlsvdp-dh.h
+++ b/beecrypt/dlsvdp-dh.h
@@ -26,8 +26,8 @@
 #ifndef _DLSVDP_DH_H
 #define _DLSVDP_DH_H
 
-#include "beecrypt/dldp.h"
-#include "beecrypt/dlkp.h"
+#include "dldp.h"
+#include "dlkp.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index 4772a27..3b266f6 100644 (file)
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -26,6 +26,7 @@
 
 #include "dsa.h"
 #include "dldp.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/dsa.h b/beecrypt/dsa.h
index 34165b2..fdfbb4a 100644 (file)
--- a/beecrypt/dsa.h
+++ b/beecrypt/dsa.h
@@ -32,7 +32,7 @@
 #ifndef _DSA_H
 #define _DSA_H
 
-#include "beecrypt/dlkp.h"
+#include "dlkp.h"
 
 typedef dldp_p dsaparam;
 typedef dlpk_p dsapub;

diff --git a/beecrypt/elgamal.c b/beecrypt/elgamal.c
index d9ddf42..3453fa8 100644 (file)
--- a/beecrypt/elgamal.c
+++ b/beecrypt/elgamal.c
@@ -26,6 +26,7 @@
 
 #include "elgamal.h"
 #include "dldp.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h
index 164a836..518e63b 100644 (file)
--- a/beecrypt/elgamal.h
+++ b/beecrypt/elgamal.h
@@ -38,7 +38,7 @@
 #ifndef _ELGAMAL_H
 #define _ELGAMAL_H
 
-#include "beecrypt/mpbarrett.h"
+#include "mpbarrett.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/endianness.h b/beecrypt/endianness.h
index f11dddb..edddabd 100644 (file)
--- a/beecrypt/endianness.h
+++ b/beecrypt/endianness.h
@@ -26,7 +26,7 @@
 #ifndef _ENDIANNESS_H
 #define _ENDIANNESS_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef __cplusplus
 inline int16_t swap16(int16_t n)

diff --git a/beecrypt/entropy.h b/beecrypt/entropy.h
index b425d96..69aa713 100644 (file)
--- a/beecrypt/entropy.h
+++ b/beecrypt/entropy.h
@@ -26,7 +26,7 @@
 #ifndef _ENTROPY_H
 #define _ENTROPY_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #if WIN32
 #include <Windows.h>

diff --git a/beecrypt/fips186.c b/beecrypt/fips186.c
index d5e244c..2b88ed8 100644 (file)
--- a/beecrypt/fips186.c
+++ b/beecrypt/fips186.c
@@ -25,7 +25,10 @@
 
 #include "system.h"
 
+#include "beecrypt.h"
 #include "fips186.h"
+#include "mpopt.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/fips186.h b/beecrypt/fips186.h
index f4b012c..e9f722e 100644 (file)
--- a/beecrypt/fips186.h
+++ b/beecrypt/fips186.h
@@ -26,7 +26,8 @@
 #ifndef _FIPS186_H
 #define _FIPS186_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
+#include "sha1.h"
 
 #ifdef _REENTRANT
 # if WIN32
@@ -35,9 +36,6 @@
 # endif
 #endif
 
-#include "beecrypt.h"
-#include "sha1.h"
-
 #if (MP_WBITS == 64)
 # define FIPS186_STATE_SIZE    8
 #elif (MP_WBITS == 32)

diff --git a/beecrypt/hmac.c b/beecrypt/hmac.c
index 7d47231..50a3fd0 100644 (file)
--- a/beecrypt/hmac.c
+++ b/beecrypt/hmac.c
@@ -30,6 +30,7 @@
 #include "system.h"
 
 #include "hmac.h"
+#include "mp.h"
 #include "endianness.h"
 
 #include "debug.h"

diff --git a/beecrypt/hmac.h b/beecrypt/hmac.h
index 709bb07..a9e61ec 100644 (file)
--- a/beecrypt/hmac.h
+++ b/beecrypt/hmac.h
@@ -26,7 +26,7 @@
 #ifndef _HMAC_H
 #define _HMAC_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 /*!\ingroup HMAC_m
  */

diff --git a/beecrypt/hmacmd5.h b/beecrypt/hmacmd5.h
index fb151f1..04219fe 100644 (file)
--- a/beecrypt/hmacmd5.h
+++ b/beecrypt/hmacmd5.h
@@ -26,8 +26,8 @@
 #ifndef _HMACMD5_H
 #define _HMACMD5_H
 
-#include "beecrypt/hmac.h"
-#include "beecrypt/md5.h"
+#include "hmac.h"
+#include "md5.h"
 
 /*!\ingroup HMAC_md5_m
  */

diff --git a/beecrypt/hmacsha1.h b/beecrypt/hmacsha1.h
index 207f5df..efafccd 100644 (file)
--- a/beecrypt/hmacsha1.h
+++ b/beecrypt/hmacsha1.h
@@ -26,8 +26,8 @@
 #ifndef _HMACSHA1_H
 #define _HMACSHA1_H
 
-#include "beecrypt/hmac.h"
-#include "beecrypt/sha1.h"
+#include "hmac.h"
+#include "sha1.h"
 
 /*!\ingroup HMAC_sha1_m
  */

diff --git a/beecrypt/hmacsha256.h b/beecrypt/hmacsha256.h
index 6ee6010..bc56efb 100644 (file)
--- a/beecrypt/hmacsha256.h
+++ b/beecrypt/hmacsha256.h
@@ -26,8 +26,8 @@
 #ifndef _HMACSHA256_H
 #define _HMACSHA256_H
 
-#include "beecrypt/hmac.h"
-#include "beecrypt/sha256.h"
+#include "hmac.h"
+#include "sha256.h"
 
 /*!\ingroup HMAC_sha256_m
  */

diff --git a/beecrypt/md5.c b/beecrypt/md5.c
index 7159c1a..3af34cc 100644 (file)
--- a/beecrypt/md5.c
+++ b/beecrypt/md5.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "md5.h"
+#include "mp.h"
 #include "endianness.h"
 
 #include "debug.h"

diff --git a/beecrypt/md5.h b/beecrypt/md5.h
index 2e5a6ff..00be95b 100644 (file)
--- a/beecrypt/md5.h
+++ b/beecrypt/md5.h
@@ -26,7 +26,7 @@
 #ifndef _MD5_H
 #define _MD5_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 /*!\brief Holds all the parameters necessary for the MD5 algorithm.
  * \ingroup HASH_md5_h

diff --git a/beecrypt/memchunk.h b/beecrypt/memchunk.h
index 4778b7c..b08b9be 100644 (file)
--- a/beecrypt/memchunk.h
+++ b/beecrypt/memchunk.h
@@ -23,7 +23,7 @@
 #ifndef _MEMCHUNK_H
 #define _MEMCHUNK_H
 
-#include "beecrypt/api.h"
+#include "api.h"
 
 typedef struct
 {

diff --git a/beecrypt/mp.c b/beecrypt/mp.c
index 6ae4e88..6aab9a1 100644 (file)
--- a/beecrypt/mp.c
+++ b/beecrypt/mp.c
@@ -25,8 +25,9 @@
 
 #include "system.h"
 
-#include "mp.h"
+#include "beecrypt.h"
 #include "mpopt.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/mp.h b/beecrypt/mp.h
index 57a3e6c..ec5a5b9 100644 (file)
--- a/beecrypt/mp.h
+++ b/beecrypt/mp.h
@@ -41,8 +41,8 @@
 #ifndef _MP_H
 #define _MP_H
 
-#include "beecrypt/api.h"
-#include "beecrypt/mpopt.h"
+#include "api.h"
+#include "mpopt.h"
 
 #define MP_HWBITS      (MP_WBITS >> 1)
 #define MP_WBYTES      (MP_WBITS >> 3)

diff --git a/beecrypt/mpbarrett.c b/beecrypt/mpbarrett.c
index 90668a0..24e5d1d 100644 (file)
--- a/beecrypt/mpbarrett.c
+++ b/beecrypt/mpbarrett.c
@@ -30,6 +30,7 @@
 #include "system.h"
 
 #include "beecrypt.h"
+#include "mp.h"
 #include "mpprime.h"
 #include "mpnumber.h"
 #include "mpbarrett.h"

diff --git a/beecrypt/mpbarrett.h b/beecrypt/mpbarrett.h
index 3cb362e..c8b26f2 100644 (file)
--- a/beecrypt/mpbarrett.h
+++ b/beecrypt/mpbarrett.h
@@ -26,8 +26,8 @@
 #ifndef _MPBARRETT_H
 #define _MPBARRETT_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/mpnumber.h"
+#include "beecrypt.h"
+#include "mpnumber.h"
 
 #ifdef __cplusplus
 # include <iostream>

diff --git a/beecrypt/mpnumber.c b/beecrypt/mpnumber.c
index e35bf3c..558e80a 100644 (file)
--- a/beecrypt/mpnumber.c
+++ b/beecrypt/mpnumber.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "mpnumber.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/mpnumber.h b/beecrypt/mpnumber.h
index 08156e3..277837c 100644 (file)
--- a/beecrypt/mpnumber.h
+++ b/beecrypt/mpnumber.h
@@ -26,7 +26,7 @@
 #ifndef _MPNUMBER_H
 #define _MPNUMBER_H
 
-#include "beecrypt/mp.h"
+#include "mp.h"
 
 #ifdef __cplusplus
 # include <iostream>

diff --git a/beecrypt/mpprime.c b/beecrypt/mpprime.c
index 3a31727..523db44 100644 (file)
--- a/beecrypt/mpprime.c
+++ b/beecrypt/mpprime.c
@@ -26,6 +26,8 @@
 #include "system.h"
 
 #include "mpprime.h"
+#include "mp.h"
+#include "mpbarrett.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/mpprime.h b/beecrypt/mpprime.h
index 61e400d..4fb8e4d 100644 (file)
--- a/beecrypt/mpprime.h
+++ b/beecrypt/mpprime.h
@@ -26,7 +26,7 @@
 #ifndef _MPPRIME_H
 #define _MPPRIME_H
 
-#include "beecrypt/mpbarrett.h"
+#include "mpbarrett.h"
 
 #define SMALL_PRIMES_PRODUCT_MAX       32
 

diff --git a/beecrypt/mtprng.c b/beecrypt/mtprng.c
index d5fc06c..2a6bc70 100644 (file)
--- a/beecrypt/mtprng.c
+++ b/beecrypt/mtprng.c
@@ -34,7 +34,10 @@
 
 #include "system.h"
 
+#include "beecrypt.h"
 #include "mtprng.h"
+#include "mpopt.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/mtprng.h b/beecrypt/mtprng.h
index 4e60318..f54206f 100644 (file)
--- a/beecrypt/mtprng.h
+++ b/beecrypt/mtprng.h
@@ -26,7 +26,7 @@
 #ifndef _MTPRNG_H
 #define _MTPRNG_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef _REENTRANT
 # if WIN32

diff --git a/beecrypt/pkcs1.h b/beecrypt/pkcs1.h
index 336fbf1..36febb4 100644 (file)
--- a/beecrypt/pkcs1.h
+++ b/beecrypt/pkcs1.h
@@ -6,7 +6,7 @@
 #ifndef _PKCS1_H
 #define _PKCS1_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/pkcs12.h b/beecrypt/pkcs12.h
index 60a1587..4eeceb9 100644 (file)
--- a/beecrypt/pkcs12.h
+++ b/beecrypt/pkcs12.h
@@ -6,7 +6,7 @@
 #ifndef _PKCS12_H
 #define _PKCS12_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/python/_bc-py.c b/beecrypt/python/_bc-py.c
index 2074d1c..d2f4b9b 100644 (file)
--- a/beecrypt/python/_bc-py.c
+++ b/beecrypt/python/_bc-py.c
@@ -5,22 +5,11 @@
 #define        _REENTRANT      1       /* XXX config.h collides with pyconfig.h */
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include "mpw-py.h"
 #include "rng-py.h"
 
 #include "debug.h"
 
-#ifdef __LCLINT__
-#undef PyObject_HEAD
-#define        PyObject_HEAD   int _PyObjectHead
-#endif
-
 /**
  */
 PyObject * py_bcError;

diff --git a/beecrypt/python/mpw-py.c b/beecrypt/python/mpw-py.c
index 998fbcb..c5303da 100644 (file)
--- a/beecrypt/python/mpw-py.c
+++ b/beecrypt/python/mpw-py.c
@@ -3,18 +3,11 @@
  */
 
 #define        _REENTRANT      1       /* XXX config.h collides with pyconfig.h */
-#define        _GNU_SOURCE             /* XXX pick up stpcpy et al */
 
 #include "system.h"
 
-#include "Python.h"
 #include "longintrepr.h"
 
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include "mpw-py.h"
 #include "rng-py.h"
 
@@ -2341,7 +2334,7 @@ PyTypeObject mpw_Type = {
        0,                              /* tp_init */
        0,                              /* tp_alloc */
        (newfunc) mpw_new,              /* tp_new */
-       (destructor) mpw_free,          /* tp_free */
+       mpw_free,                       /* tp_free */
        0,                              /* tp_is_gc */
 };
 /*@=fullinitblock@*/

diff --git a/beecrypt/python/mpw-py.h b/beecrypt/python/mpw-py.h
index e340533..2ef9707 100644 (file)
--- a/beecrypt/python/mpw-py.h
+++ b/beecrypt/python/mpw-py.h
@@ -4,7 +4,7 @@
 /** \ingroup py_c  
  * \file python/mpw-py.h
  */
-#include "beecrypt/mp.h"
+#include "mp.h"
 
 /**
  */

diff --git a/beecrypt/python/rng-py.c b/beecrypt/python/rng-py.c
index 1b46516..baed893 100644 (file)
--- a/beecrypt/python/rng-py.c
+++ b/beecrypt/python/rng-py.c
@@ -6,12 +6,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include "rng-py.h"
 
 #include "debug-py.c"
@@ -322,7 +316,7 @@ PyTypeObject rng_Type = {
        (initproc) rng_init,            /* tp_init */
        (allocfunc) rng_alloc,          /* tp_alloc */
        (newfunc) rng_new,              /* tp_new */
-       (destructor) rng_free,          /* tp_free */
+       rng_free,                       /* tp_free */
        0,                              /* tp_is_gc */
 #endif
 };

diff --git a/beecrypt/python/rng-py.h b/beecrypt/python/rng-py.h
index 32162c0..70a99c5 100644 (file)
--- a/beecrypt/python/rng-py.h
+++ b/beecrypt/python/rng-py.h
@@ -4,8 +4,8 @@
 /** \ingroup py_c  
  * \file python/rng-py.h
  */
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/mpprime.h"
+#include "beecrypt.h"
+#include "mpprime.h"
 
 /**
  */

diff --git a/beecrypt/python/system.h b/beecrypt/python/system.h
new file mode 100644 (file)
index 0000000..64b813a
--- /dev/null
+++ b/beecrypt/python/system.h
@@ -0,0 +1,17 @@
+/** \ingroup py_c
+ * \file python/system.h
+ */
+
+#ifndef H_SYSTEM_PYTHON
+#define        H_SYSTEM_PYTHON
+
+#include "Python.h"
+
+#ifdef __LCLINT__
+#undef  PyObject_HEAD
+#define PyObject_HEAD   int _PyObjectHead;
+#endif
+
+#include "../system.h"
+
+#endif /* H_SYSTEM_PYTHON */

diff --git a/beecrypt/rsa.c b/beecrypt/rsa.c
index bcf64fc..789d838 100644 (file)
--- a/beecrypt/rsa.c
+++ b/beecrypt/rsa.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "rsa.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/rsa.h b/beecrypt/rsa.h
index dbb0e45..3daee16 100644 (file)
--- a/beecrypt/rsa.h
+++ b/beecrypt/rsa.h
@@ -26,7 +26,7 @@
 #ifndef _RSA_H
 #define _RSA_H
 
-#include "beecrypt/rsakp.h"
+#include "rsakp.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/rsakp.c b/beecrypt/rsakp.c
index a752c4a..51205c2 100644 (file)
--- a/beecrypt/rsakp.c
+++ b/beecrypt/rsakp.c
@@ -27,6 +27,7 @@
 
 #include "rsakp.h"
 #include "mpprime.h"
+#include "mp.h"
 
 #include "debug.h"
 

diff --git a/beecrypt/rsakp.h b/beecrypt/rsakp.h
index b8bab5f..3f342f3 100644 (file)
--- a/beecrypt/rsakp.h
+++ b/beecrypt/rsakp.h
@@ -26,7 +26,7 @@
 #ifndef _RSAKP_H
 #define _RSAKP_H
 
-#include "beecrypt/rsapk.h"
+#include "rsapk.h"
 
 /*!\brief RSA keypair.
  * \ingroup IF_rsa_m

diff --git a/beecrypt/rsapk.h b/beecrypt/rsapk.h
index 96b746d..552dc09 100644 (file)
--- a/beecrypt/rsapk.h
+++ b/beecrypt/rsapk.h
@@ -26,7 +26,7 @@
 #ifndef _RSAPK_H
 #define _RSAPK_H
 
-#include "beecrypt/mpbarrett.h"
+#include "mpbarrett.h"
 
 #ifdef __cplusplus
 struct BEECRYPTAPI rsapk

diff --git a/beecrypt/sha1.c b/beecrypt/sha1.c
index 2659468..d7f3c1c 100644 (file)
--- a/beecrypt/sha1.c
+++ b/beecrypt/sha1.c
@@ -25,7 +25,10 @@
  
 #include "system.h"
 
+#include "beecrypt.h"
+#include "sha1opt.h"
 #include "sha1.h"
+#include "mp.h"
 #include "endianness.h"
 
 #include "debug.h"

diff --git a/beecrypt/sha1.h b/beecrypt/sha1.h
index 2a811bc..5fc9d22 100644 (file)
--- a/beecrypt/sha1.h
+++ b/beecrypt/sha1.h
@@ -26,8 +26,8 @@
 #ifndef _SHA1_H
 #define _SHA1_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/sha1opt.h"
+#include "beecrypt.h"
+#include "sha1opt.h"
 
 /*!\brief Holds all the parameters necessary for the SHA-1 algorithm.
  * \ingroup HASH_sha1_m

diff --git a/beecrypt/sha1opt.h b/beecrypt/sha1opt.h
index 9fb0eab..0269cdf 100644 (file)
--- a/beecrypt/sha1opt.h
+++ b/beecrypt/sha1opt.h
@@ -26,8 +26,8 @@
 #ifndef _SHA1OPT_H
 #define _SHA1OPT_H
 
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/sha1.h"
+#include "beecrypt.h"
+#include "sha1.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/beecrypt/sha256.c b/beecrypt/sha256.c
index 55aa614..e96aa89 100644 (file)
--- a/beecrypt/sha256.c
+++ b/beecrypt/sha256.c
@@ -26,6 +26,7 @@
 #include "system.h"
 
 #include "sha256.h"
+#include "mp.h"
 #include "endianness.h"
 
 #include "debug.h"

diff --git a/beecrypt/sha256.h b/beecrypt/sha256.h
index 9c3db97..c492ed4 100644 (file)
--- a/beecrypt/sha256.h
+++ b/beecrypt/sha256.h
@@ -26,7 +26,7 @@
 #ifndef _SHA256_H
 #define _SHA256_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 /*!\brief Holds all the parameters necessary for the SHA-256 algorithm.
  * \ingroup HASH_sha256_m

diff --git a/beecrypt/timestamp.h b/beecrypt/timestamp.h
index 2616e64..2333d52 100644 (file)
--- a/beecrypt/timestamp.h
+++ b/beecrypt/timestamp.h
@@ -26,7 +26,7 @@
 #ifndef _TIMESTAMP_H
 #define _TIMESTAMP_H
 
-#include "beecrypt/beecrypt.h"
+#include "beecrypt.h"
 
 #if HAVE_LONG_LONG
 # define ONE_SECOND    1000LL