bc-3.0.0: rename mp32*.[ch] files.

CVS patchset: 6774
CVS date: 2003/04/25 16:53:36

34 files changed, 72 insertions, 72 deletions

diff --git a/beecrypt/.cvsignore b/beecrypt/.cvsignore
index ebce76608..5815df550 100644
--- a/beecrypt/.cvsignore
+++ b/beecrypt/.cvsignore
@@ -27,7 +27,7 @@ ltconfig
 ltmain.sh
 aesopt.c
 blowfishopt.c
-mp32opt.c
+mpopt.c
 sha1opt.c
 *.la
 *.lcd
diff --git a/beecrypt/Doxyfile.in b/beecrypt/Doxyfile.in
index e8458eef1..d69804a34 100644
--- a/beecrypt/Doxyfile.in
+++ b/beecrypt/Doxyfile.in
@@ -357,15 +357,15 @@ INPUT                  = \
 	@top_srcdir@/md5.h \
 	@top_srcdir@/memchunk.c \
 	@top_srcdir@/memchunk.h \
-	@top_srcdir@/mp32barrett.c \
-	@top_srcdir@/mp32barrett.h \
-	@top_srcdir@/mp32.c \
-	@top_srcdir@/mp32.h \
-	@top_srcdir@/mp32number.c \
-	@top_srcdir@/mp32number.h \
-	@top_srcdir@/mp32opt.h \
-	@top_srcdir@/mp32prime.c \
-	@top_srcdir@/mp32prime.h \
+	@top_srcdir@/mpbarrett.c \
+	@top_srcdir@/mpbarrett.h \
+	@top_srcdir@/mp.c \
+	@top_srcdir@/mp.h \
+	@top_srcdir@/mpnumber.c \
+	@top_srcdir@/mpnumber.h \
+	@top_srcdir@/mpopt.h \
+	@top_srcdir@/mpprime.c \
+	@top_srcdir@/mpprime.h \
 	@top_srcdir@/mtprng.c \
 	@top_srcdir@/mtprng.h \
 	@top_srcdir@/rsa.c \
diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am
index a233dd814..6d6237722 100644
--- a/beecrypt/Makefile.am
+++ b/beecrypt/Makefile.am
@@ -42,25 +42,25 @@ SUFFIXES = .S
 .S.lo:
 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
-BEECRYPT_OBJECTS = aes.lo aesopt.lo base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfish.lo blowfishopt.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo hmacsha256.lo md5.lo memchunk.lo mp32.lo mp32barrett.lo mp32number.lo mp32opt.lo mp32prime.lo mtprng.lo rsa.lo rsakp.lo rsapk.lo sha1.lo sha1opt.lo sha256.lo timestamp.lo
+BEECRYPT_OBJECTS = aes.lo aesopt.lo base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfish.lo blowfishopt.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo hmacsha256.lo md5.lo memchunk.lo mp.lo mpbarrett.lo mpnumber.lo mpopt.lo mpprime.lo mtprng.lo rsa.lo rsakp.lo rsapk.lo sha1.lo sha1opt.lo sha256.lo timestamp.lo
 
 BEECRYPT_JAVA_OBJECTS = javaglue.lo
 
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = libbeecrypt.la
 
-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c javaglue.c md5.c memchunk.c mp32.c mp32barrett.c mp32number.c mp32prime.c mtprng.c rsa.c rsakp.c rsapk.c sha1.c sha256.c timestamp.c
+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c javaglue.c md5.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c rsa.c rsakp.c rsapk.c sha1.c sha256.c timestamp.c
 
 libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) $(BEECRYPT_JAVA_OBJECTS)
 
-libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mp32opt.lo sha1opt.lo
+libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo
 
 libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
 
-pkginclude_HEADERS = aes.h base64.h beecrypt.h blockmode.h blockpad.h blowfish.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha1.h sha256.h timestamp.h
+pkginclude_HEADERS = aes.h base64.h beecrypt.h blockmode.h blockpad.h blowfish.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp.h mpbarrett.h mpnumber.h mpprime.h mtprng.h rsa.h rsakp.h rsapk.h sha1.h sha256.h timestamp.h
 
 noinst_HEADERS = aesopt.h beecrypt.api.h beecrypt.gas.h beecrypt.win.h \
-	blowfishopt.h debug.h mp32opt.h sha1opt.h system.h
+	blowfishopt.h debug.h mpopt.h sha1opt.h system.h
 
 EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README README.DARWIN README.DLL README.WIN32 beecrypt.def beecrypt.rc beecrypt.spec types.h javaglue.h installgen.sh
 
diff --git a/beecrypt/aes.c b/beecrypt/aes.c
index 01f7f6a4d..67189b9d9 100644
--- a/beecrypt/aes.c
+++ b/beecrypt/aes.c
@@ -29,7 +29,7 @@
 #include "aesopt.h"
 #include "aes.h"
 #include "endianness.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 /*@-exportheadervar -exportlocal@*/ /* FIX: tables needed by aes asm */
diff --git a/beecrypt/beecrypt.c b/beecrypt/beecrypt.c
index d5a6f24a3..4cb6389b9 100644
--- a/beecrypt/beecrypt.c
+++ b/beecrypt/beecrypt.c
@@ -45,7 +45,7 @@ typedef struct
 #include "hmacsha1.h"
 #include "hmacsha256.h"
 #include "md5.h"
-#include "mp32.h"
+#include "mp.h"
 #include "mtprng.h"
 #include "sha1.h"
 #include "sha256.h"
diff --git a/beecrypt/beecrypt.h b/beecrypt/beecrypt.h
index 412cc5bf4..4ce2282dc 100644
--- a/beecrypt/beecrypt.h
+++ b/beecrypt/beecrypt.h
@@ -29,7 +29,7 @@
 #include "types.h"
 
 #include "memchunk.h"
-#include "mp32number.h"
+#include "mpnumber.h"
 
 /** \name Entropy sources */
 /*@{*/
diff --git a/beecrypt/beetest.c b/beecrypt/beetest.c
index 80e148464..ad0bc829c 100644
--- a/beecrypt/beetest.c
+++ b/beecrypt/beetest.c
@@ -27,7 +27,7 @@
 #include "beecrypt.h"
 #include "blockmode.h"
 #include "blowfish.h"
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 #include "dhaes.h"
 #include "dlkp.h"
 #include "elgamal.h"
diff --git a/beecrypt/blockmode.c b/beecrypt/blockmode.c
index d803459ec..7383d81d2 100644
--- a/beecrypt/blockmode.c
+++ b/beecrypt/blockmode.c
@@ -27,7 +27,7 @@
 
 #include "system.h"
 #include "blockmode.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 int blockEncrypt(const blockCipher* bc, blockCipherParam* bp, cipherMode mode, int blocks, uint32* dst, const uint32* src)
diff --git a/beecrypt/configure.ac b/beecrypt/configure.ac
index bd4f009fc..358835e2a 100644
--- a/beecrypt/configure.ac
+++ b/beecrypt/configure.ac
@@ -830,17 +830,17 @@ fi
 # Generate the assembler optimizations, or empty stub files.
 rm -f $srcdir/aesopt.c $srcdir/aesopt.S
 rm -f $srcdir/blowfishopt.c $srcdir/blowfishopt.S
-rm -f $srcdir/mp32opt.c $srcdir/mp32opt.S
+rm -f $srcdir/mpopt.c $srcdir/mpopt.S
 rm -f $srcdir/sha1opt.c $srcdir/sha1opt.S
 if test "$ac_enable_optimized" = yes; then
   case $target_cpu in
     arm*)
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.arm.S"
 EOF
       ;;
     i[[34]]86)
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.i386.S"
 EOF
       ;;
@@ -851,7 +851,7 @@ EOF
       cat > $srcdir/blowfishopt.S << EOF
 #include "gas/blowfishopt.i586.S"
 EOF
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.i386.S"
 EOF
       cat > $srcdir/sha1opt.S << EOF
@@ -859,7 +859,7 @@ EOF
 EOF
       ;;
     ia64)
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.ia64.S"
 EOF
       ;;
@@ -870,17 +870,17 @@ EOF
       cat > $srcdir/blowfishopt.S << EOF
 #include "gas/blowfishopt.powerpc.S"
 EOF
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.powerpc.S"
 EOF
       ;;
     sparcv8)
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.sparcv8.S"
 EOF
       ;;
     sparcv8plus* | sparcv9*)
-      cat > $srcdir/mp32opt.S << EOF
+      cat > $srcdir/mpopt.S << EOF
 #include "gas/mp32opt.sparcv9.S"
 EOF
       ;;
@@ -894,8 +894,8 @@ if test ! -r $srcdir/blowfishopt.S; then
   cat > $srcdir/blowfishopt.c << EOF
 EOF
 fi
-if test ! -r $srcdir/mp32opt.S; then
-  cat > $srcdir/mp32opt.c << EOF
+if test ! -r $srcdir/mpopt.S; then
+  cat > $srcdir/mpopt.c << EOF
 EOF
 fi
 if test ! -r $srcdir/sha1opt.S; then
diff --git a/beecrypt/dldp.c b/beecrypt/dldp.c
index d328db199..f125677d9 100644
--- a/beecrypt/dldp.c
+++ b/beecrypt/dldp.c
@@ -29,8 +29,8 @@
 
 #include "system.h"
 #include "dldp.h"
-#include "mp32.h"
-#include "mp32prime.h"
+#include "mp.h"
+#include "mpprime.h"
 #include "debug.h"
 
 /**
diff --git a/beecrypt/dldp.h b/beecrypt/dldp.h
index 000977544..76afd60a7 100644
--- a/beecrypt/dldp.h
+++ b/beecrypt/dldp.h
@@ -31,7 +31,7 @@
 #define _DLDP_H
 
 #include "beecrypt.h"
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 
 /**
  * Discrete Logarithm Domain Parameters - Prime
diff --git a/beecrypt/dlpk.c b/beecrypt/dlpk.c
index 6d53bdb0e..eaa3e4457 100644
--- a/beecrypt/dlpk.c
+++ b/beecrypt/dlpk.c
@@ -27,7 +27,7 @@
 
 #include "system.h"
 #include "dlpk.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 int dlpk_pInit(dlpk_p* pk)
diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index 5bc4f3649..9f6b9255f 100644
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -44,7 +44,7 @@
 #include "system.h"
 #include "dsa.h"
 #include "dldp.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 /*@-boundswrite@*/
diff --git a/beecrypt/dsa.h b/beecrypt/dsa.h
index 45e79d4ec..2ff24e13b 100644
--- a/beecrypt/dsa.h
+++ b/beecrypt/dsa.h
@@ -28,7 +28,7 @@
 #ifndef _DSA_H
 #define _DSA_H
 
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/beecrypt/elgamal.c b/beecrypt/elgamal.c
index 2573f1b8d..6ef34e267 100644
--- a/beecrypt/elgamal.c
+++ b/beecrypt/elgamal.c
@@ -57,7 +57,7 @@
 #include "system.h"
 #include "elgamal.h"
 #include "dldp.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 int elgv1sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext* rgc, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h
index c990ab562..5f5cc0646 100644
--- a/beecrypt/elgamal.h
+++ b/beecrypt/elgamal.h
@@ -28,7 +28,7 @@
 #ifndef _ELGAMAL_H
 #define _ELGAMAL_H
 
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/beecrypt/fips186.c b/beecrypt/fips186.c
index 58de57fa5..ef67fc671 100644
--- a/beecrypt/fips186.c
+++ b/beecrypt/fips186.c
@@ -28,8 +28,8 @@
 #include "system.h"
 #include "beecrypt.h"
 #include "fips186.h"
-#include "mp32opt.h"
-#include "mp32.h"
+#include "mpopt.h"
+#include "mp.h"
 #include "debug.h"
 
 /**
diff --git a/beecrypt/hmac.c b/beecrypt/hmac.c
index 7718a4c3c..3e2522a97 100644
--- a/beecrypt/hmac.c
+++ b/beecrypt/hmac.c
@@ -27,7 +27,7 @@
 
 #include "system.h"
 #include "hmac.h"
-#include "mp32.h"
+#include "mp.h"
 #include "endianness.h"
 #include "debug.h"
 
diff --git a/beecrypt/md5.c b/beecrypt/md5.c
index 9f751de4a..de9cfd675 100644
--- a/beecrypt/md5.c
+++ b/beecrypt/md5.c
@@ -27,7 +27,7 @@
 
 #include "system.h"
 #include "md5.h"
-#include "mp32.h"
+#include "mp.h"
 #include "endianness.h"
 #include "debug.h"
 
diff --git a/beecrypt/mp32.c b/beecrypt/mp.c
index af752cb87..38deebfd3 100644
--- a/beecrypt/mp32.c
+++ b/beecrypt/mp.c
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32.c
+ * \file mp.c
  *
  * Multiprecision 2's complement integer routines for 32 bit cpu, code.
  */
@@ -27,8 +27,8 @@
 
 #include "system.h"
 #include "beecrypt.h"
-#include "mp32opt.h"
-#include "mp32.h"
+#include "mpopt.h"
+#include "mp.h"
 #include "debug.h"
 
 #ifndef ASM_MP32ZERO
diff --git a/beecrypt/mp32.h b/beecrypt/mp.h
index 799529d71..24b26750f 100644
--- a/beecrypt/mp32.h
+++ b/beecrypt/mp.h
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32.h
+ * \file mp.h
  *
  * Multiprecision 2's complement integer routines for 32 bit cpu, header/
  */
@@ -35,7 +35,7 @@
 #endif
 #include <stdio.h>
 
-#include "mp32opt.h"
+#include "mpopt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/beecrypt/mp32barrett.c b/beecrypt/mpbarrett.c
index 02807fafa..f38f28e24 100644
--- a/beecrypt/mp32barrett.c
+++ b/beecrypt/mpbarrett.c
@@ -1,6 +1,6 @@
 /*@-sizeoftype -type@*/
 /** \ingroup MP_m
- * \file mp32barrett.c
+ * \file mpbarrett.c
  *
  * Barrett modular reduction, code.
  *
@@ -32,9 +32,9 @@
  */
 
 #include "system.h"
-#include "mp32.h"
-#include "mp32prime.h"
-#include "mp32barrett.h"
+#include "mp.h"
+#include "mpprime.h"
+#include "mpbarrett.h"
 #include "debug.h"
 
 /**
diff --git a/beecrypt/mp32barrett.h b/beecrypt/mpbarrett.h
index aceffad1f..077b3bf23 100644
--- a/beecrypt/mp32barrett.h
+++ b/beecrypt/mpbarrett.h
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32barrett.h
+ * \file mpbarrett.h
  *
  * Barrett modular reduction, header.
  */
@@ -29,7 +29,7 @@
 #define _MP32BARRETT_H
 
 #include "beecrypt.h"
-#include "mp32number.h"
+#include "mpnumber.h"
 
 typedef struct
 {
diff --git a/beecrypt/mp32number.c b/beecrypt/mpnumber.c
index 778c75b77..090487eda 100644
--- a/beecrypt/mp32number.c
+++ b/beecrypt/mpnumber.c
@@ -1,6 +1,6 @@
 /*@-sizeoftype@*/
 /** \ingroup MP_m
- * \file mp32number.c
+ * \file mpnumber.c
  *
  * Multiple precision numbers, code.
  */
@@ -28,8 +28,8 @@
  */
 
 #include "system.h"
-#include "mp32number.h"
-#include "mp32.h"
+#include "mpnumber.h"
+#include "mp.h"
 #include "debug.h"
 
 void mp32nzero(mp32number* n)
diff --git a/beecrypt/mp32number.h b/beecrypt/mpnumber.h
index 6fbf63452..f8393c53d 100644
--- a/beecrypt/mp32number.h
+++ b/beecrypt/mpnumber.h
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32number.h
+ * \file mpnumber.h
  *
  * Multiprecision numbers, header.
  */
diff --git a/beecrypt/mp32opt.h b/beecrypt/mpopt.h
index 67d589782..fcf06733f 100644
--- a/beecrypt/mp32opt.h
+++ b/beecrypt/mpopt.h
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32opt.h
+ * \file mpopt.h
  *
  * Multiprecision integer assembler-optimized routined for 32 bit cpu, header.
  */
diff --git a/beecrypt/mp32prime.c b/beecrypt/mpprime.c
index 96322a843..a39183ed9 100644
--- a/beecrypt/mp32prime.c
+++ b/beecrypt/mpprime.c
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32prime.c
+ * \file mpprime.c
  *
  * Multi-precision primes, code.
  */
@@ -26,9 +26,9 @@
  */
 
 #include "system.h"
-#include "mp32prime.h"
-#include "mp32.h"
-#include "mp32barrett.h"
+#include "mpprime.h"
+#include "mp.h"
+#include "mpbarrett.h"
 #include "debug.h"
 
 /**
diff --git a/beecrypt/mp32prime.h b/beecrypt/mpprime.h
index 8d974ab2c..d8aa9a6c8 100644
--- a/beecrypt/mp32prime.h
+++ b/beecrypt/mpprime.h
@@ -1,5 +1,5 @@
 /** \ingroup MP_m
- * \file mp32prime.h
+ * \file mpprime.h
  *
  * Multi-precision primes, header.
  */
@@ -28,7 +28,7 @@
 #ifndef _MP32PRIME_H
 #define _MP32PRIME_H
 
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 
 #define SMALL_PRIMES_PRODUCT_MAX	64
 
diff --git a/beecrypt/mtprng.c b/beecrypt/mtprng.c
index c5ef6a3fb..d4b0d283b 100644
--- a/beecrypt/mtprng.c
+++ b/beecrypt/mtprng.c
@@ -38,8 +38,8 @@
 #include "system.h"
 #include "beecrypt.h"
 #include "mtprng.h"
-#include "mp32opt.h"
-#include "mp32.h"
+#include "mpopt.h"
+#include "mp.h"
 #include "debug.h"
 
 #define hiBit(a)		((a) & 0x80000000)
diff --git a/beecrypt/rsa.c b/beecrypt/rsa.c
index e15a73b2e..3828b7c57 100644
--- a/beecrypt/rsa.c
+++ b/beecrypt/rsa.c
@@ -27,7 +27,7 @@
 
 #include "system.h"
 #include "rsa.h"
-#include "mp32.h"
+#include "mp.h"
 #include "debug.h"
 
 int rsapri(const rsakp* kp, const mp32number* m, mp32number* c)
diff --git a/beecrypt/rsakp.c b/beecrypt/rsakp.c
index 467759bbe..4dd296d72 100644
--- a/beecrypt/rsakp.c
+++ b/beecrypt/rsakp.c
@@ -29,8 +29,8 @@
 
 #include "system.h"
 #include "rsakp.h"
-#include "mp32prime.h"
-#include "mp32.h"
+#include "mpprime.h"
+#include "mp.h"
 #include "debug.h"
 
 /*@-boundswrite@*/
diff --git a/beecrypt/rsapk.h b/beecrypt/rsapk.h
index ff8b83a1a..233c66306 100644
--- a/beecrypt/rsapk.h
+++ b/beecrypt/rsapk.h
@@ -28,7 +28,7 @@
 #ifndef _RSAPK_H
 #define _RSAPK_H
 
-#include "mp32barrett.h"
+#include "mpbarrett.h"
 
 /**
  */
diff --git a/beecrypt/sha1.c b/beecrypt/sha1.c
index 7c2cc55f1..c9479417d 100644
--- a/beecrypt/sha1.c
+++ b/beecrypt/sha1.c
@@ -32,7 +32,7 @@
 #include "beecrypt.h"
 #include "sha1opt.h"
 #include "sha1.h"
-#include "mp32.h"
+#include "mp.h"
 #include "endianness.h"
 #include "debug.h"
 
diff --git a/beecrypt/sha256.c b/beecrypt/sha256.c
index 14c0a11c9..ff7a62b32 100644
--- a/beecrypt/sha256.c
+++ b/beecrypt/sha256.c
@@ -27,7 +27,7 @@
  
 #include "system.h"
 #include "sha256.h"
-#include "mp32.h"
+#include "mp.h"
 #include "endianness.h"
 #include "debug.h"