beecrypt-3.0.0 merge: copyright messages, new primitive types merged.

CVS patchset: 6775
CVS date: 2003/04/25 18:02:45

68 files changed, 214 insertions, 178 deletions

diff --git a/beecrypt/INSTALL b/beecrypt/INSTALL
index 62ea076c1..bca44d042 100644
--- a/beecrypt/INSTALL
+++ b/beecrypt/INSTALL
@@ -1,40 +1,25 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
-Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
 Basic Installation
 ==================
 
-   These are generic installation instructions.
-
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
@@ -49,7 +34,13 @@ The simplest way to compile this package is:
 
   2. Type `make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+     If you're building GNU make on a system which does not already have
+     a `make', you can use the build.sh shell script to compile.  Run
+     `sh ./build.sh'.  This should compile the program in the current
+     directory.  Then you will have a Make program that you can use for
+     `make install', or whatever else.
+
+  3. Optionally, type `./make check' to run any self-tests that come with
      the package.
 
   4. Type `make install' to install the programs and any data files and
@@ -68,15 +59,14 @@ Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for variables by setting
-them in the environment.  You can do that on the command line like this:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
 
-   *Note Defining Variables::, for more details.
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
 
 Compiling For Multiple Architectures
 ====================================
@@ -89,11 +79,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
 
 Installation Names
 ==================
@@ -136,35 +126,22 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
+   There may be some features `configure' can not figure out
 automatically, but needs to determine by the type of host the package
 will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it cannot guess the host type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
 
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
+See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
 
-   If you are _building_ compiler tools for cross-compiling, you should
+   If you are building compiler tools for cross-compiling, you can also
 use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the host
-platform (i.e., that on which the generated programs will eventually be
-run) with `--host=TYPE'.  In this case, you should also specify the
-build platform with `--build=TYPE', because, in this case, it may not
-be possible to guess the build platform (it sometimes involves
-compiling and running simple test programs, and this can't be done if
-the compiler is a cross compiler).
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
 
 Sharing Defaults
 ================
@@ -177,43 +154,19 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Defining Variables
+Operation Controls
 ==================
 
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
    `configure' recognizes the following options to control how it
 operates.
 
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
 `--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+`--help'
+     Print a summary of the options to `configure', and exit.
 
 `--quiet'
 `--silent'
@@ -226,6 +179,9 @@ operates.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
 
diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am
index 6d6237722..b07047225 100644
--- a/beecrypt/Makefile.am
+++ b/beecrypt/Makefile.am
@@ -1,9 +1,9 @@
 #
 # Makefile.am contains the top-level automake definitions
 #
-# Copyright (c) 2001, 2002 Virtual Unlimited B.V.
+#  Copyright (c) 2001, 2002, 2003 Virtual Unlimited B.V.
 #
-# Author: Bob Deblier <bob@virtualunlimited.com>
+# Author: Bob Deblier <bob.deblier@pandora.be>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/Makefile.mak b/beecrypt/Makefile.mak
index fe238cae8..2dcb7530a 100644
--- a/beecrypt/Makefile.mak
+++ b/beecrypt/Makefile.mak
@@ -4,7 +4,7 @@
 # To be used with Microsoft's nmake utility;
 # Will need the Visual C Processor Pack installed.
 #
-# Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
+# Copyright (c) 2000, 2001, 2002, 2003 Virtual Unlimited B.V.
 #
 # Author: Bob Deblier <bob@virtualunlimited.com>
 #
@@ -39,8 +39,9 @@ LIBPATH="C:\Program Files\Microsoft Visual Studio\VC98\Lib"
 JAVAPATH="C:\j2sdk1.4.0\include"
 
 
+# To enable SSE2 optimization, add switch /DOPTIMIZE_SSE2 to ASFLAGS
 ASFLAGS=/nologo /c /coff /Gd
-CFLAGS=/nologo /TC /MT /GD /GM /Ox /G5 /I. # /ZI
+CFLAGS=/nologo /TC /MT /GM /Ox /G6 /I.
 LDFLAGS=/nologo /machine:IX86 /libpath:$(LIBPATH) $(LIBS) # /DEBUG
 RCFLAGS=/r /L 0x409 /FObeecrypt.res
 JAVAFLAGS=/DJAVAGLUE=1 /I$(JAVAPATH) /I$(JAVAPATH)\win32
diff --git a/beecrypt/NEWS b/beecrypt/NEWS
index a6ba3b17f..aaeea00c0 100644
--- a/beecrypt/NEWS
+++ b/beecrypt/NEWS
@@ -1,14 +1,29 @@
-2.2.0:
+3.0.0pre:
+	- Modified the API so that all keys can be passed as arrays of bytes.
+	- Modified the API so that all key sizes are given in bits.
+	- Modified the multi-precision integer library to work better on 64-bit
+	  machines.
+	- Modified the assembly source generation mechanism, employing the m4
+	  macro processor.
+	- Added multi-precision integer vectorized assembler routines for
+	  Itanium.
+	- Added multi-precision integer assembler routines for PowerPC 64-bit.
+	- Added multi-precision integer assembler routines for Alpha.
+	- Added new benchmarking programs.
+
+2.3.0pre:
 	- Modified the header files so that the library now uses self-contained autoconf-generated configuration files; a program employing BeeCrypt can now use the symbols already tested and defined instead of having to regenerate them (thus also eliminating the risk of inconsistencies).
-        - Added the AES algorithm, with assembler routines for i586 and powerpc.
+	- Added the AES algorithm, with assembler routines for i586 and powerpc.
 	- Added the DSA signature algorithm.
-	- Added powerpc assembler routines for blowfish.
+	- Added PowerPC assembler routines for blowfish.
+	- Added Pentium4 SSE2 assembler multiplication routines.
 	- Fixed the RSA CRT algorithm.
 	- Fixed the gas/i386 mp32even and mp32odd routines.
 	- Fixed a bug in modular inverse computation; thanks to Jeff Johnson of RedHat for pointing this out.
 	- Fixed a bug in testing the result of a gcd operation in the mp32prndconone routine.
 	- Fixed an ugly bug in base64 decoding.
 	- Fixed compatibility with the latest automake & autoconf versions.
+	- Replaces CPU optimization mechanism in configure script.
 
 2.1.0:
 	- Added support for automake, autoheader and libtool, which should make compiling the library even easier.
diff --git a/beecrypt/aes.c b/beecrypt/aes.c
index 67189b9d9..50f49e86a 100644
--- a/beecrypt/aes.c
+++ b/beecrypt/aes.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/aes.h b/beecrypt/aes.h
index 99d65630c..997d965d3 100644
--- a/beecrypt/aes.h
+++ b/beecrypt/aes.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/base64.c b/beecrypt/base64.c
index c5ff741db..de472682c 100644
--- a/beecrypt/base64.c
+++ b/beecrypt/base64.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000-2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/base64.h b/beecrypt/base64.h
index c18161e16..fb766e067 100644
--- a/beecrypt/base64.h
+++ b/beecrypt/base64.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/beecrypt.api.h b/beecrypt/beecrypt.api.h
index 5ab7d266f..1c98e1688 100644
--- a/beecrypt/beecrypt.api.h
+++ b/beecrypt/beecrypt.api.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 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
+ *
+ */
+
 #ifndef _BEECRYPT_API_H
 #define _BEECRYPT_API_H
 
diff --git a/beecrypt/beecrypt.h b/beecrypt/beecrypt.h
index 4ce2282dc..bdb050595 100644
--- a/beecrypt/beecrypt.h
+++ b/beecrypt/beecrypt.h
@@ -3,7 +3,7 @@
  *
  * BeeCrypt library hooks & stubs, header
  *
- * Copyright (c) 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/beecrypt.rc b/beecrypt/beecrypt.rc
index cd3fb5adb..f734abfa0 100644
--- a/beecrypt/beecrypt.rc
+++ b/beecrypt/beecrypt.rc
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 1 VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
  FILEFLAGS 0x0L
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Virtual Unlimited B.V.\0"
 			VALUE "FileDescription", "BeeCrypt Cryptography Library\0"
-			VALUE "FileVersion", "2.1.0\0"
+			VALUE "FileVersion", "2.2.0\0"
 			VALUE "InternalName", "beecrypt\0"
-			VALUE "LegalCopyright", "Copyright (c) 1997-2001 Virtual Unlimited B.V.\0"
+			VALUE "LegalCopyright", "Copyright (c) 1997-2003 Virtual Unlimited B.V.\0"
 			VALUE "LegalTradeMarks", "BeeCrypt is a trademark of Virtual Unlimited B.V.\0"
 			VALUE "OriginalFileName", "BEECRYPT.DLL\0"
 			VALUE "ProductName", "BeeCrypt\0"
-			VALUE "ProductVersion", "2.1.0\0"
+			VALUE "ProductVersion", "2.2.0\0"
 		END
 	END
 	BLOCK "VarFileInfo"
diff --git a/beecrypt/beecrypt.win.h b/beecrypt/beecrypt.win.h
index f2e87969d..3f90c5025 100644
--- a/beecrypt/beecrypt.win.h
+++ b/beecrypt/beecrypt.win.h
@@ -3,7 +3,7 @@
  *
  * Win32 config file
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blockmode.c b/beecrypt/blockmode.c
index 7383d81d2..6324b2bfa 100644
--- a/beecrypt/blockmode.c
+++ b/beecrypt/blockmode.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blockmode.h b/beecrypt/blockmode.h
index 07ecc57fd..69ab857ec 100644
--- a/beecrypt/blockmode.h
+++ b/beecrypt/blockmode.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blockpad.c b/beecrypt/blockpad.c
index 466e44db5..e22829c22 100644
--- a/beecrypt/blockpad.c
+++ b/beecrypt/blockpad.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blockpad.h b/beecrypt/blockpad.h
index e0f152daa..4d81e3b1e 100644
--- a/beecrypt/blockpad.h
+++ b/beecrypt/blockpad.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blowfish.c b/beecrypt/blowfish.c
index 9842fc947..89c211af9 100644
--- a/beecrypt/blowfish.c
+++ b/beecrypt/blowfish.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * Copyright (c) 1999, 2000 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blowfish.h b/beecrypt/blowfish.h
index 1c084f42e..85739a1d8 100644
--- a/beecrypt/blowfish.h
+++ b/beecrypt/blowfish.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1999, 2000 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/blowfishopt.h b/beecrypt/blowfishopt.h
index 21f47e01e..5f9ae4bc8 100644
--- a/beecrypt/blowfishopt.h
+++ b/beecrypt/blowfishopt.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002, 2003 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dhaes.c b/beecrypt/dhaes.c
index 5f89bcd76..4a31736a1 100644
--- a/beecrypt/dhaes.c
+++ b/beecrypt/dhaes.c
@@ -28,7 +28,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited, B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited, B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dhaes.h b/beecrypt/dhaes.h
index c3e07aed6..8d2df4290 100644
--- a/beecrypt/dhaes.h
+++ b/beecrypt/dhaes.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited, B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited, B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dldp.c b/beecrypt/dldp.c
index f125677d9..e315949c5 100644
--- a/beecrypt/dldp.c
+++ b/beecrypt/dldp.c
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002, 2003 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dldp.h b/beecrypt/dldp.h
index 76afd60a7..ce2a5e049 100644
--- a/beecrypt/dldp.h
+++ b/beecrypt/dldp.h
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlkp.c b/beecrypt/dlkp.c
index 67f86093a..0d29d0d34 100644
--- a/beecrypt/dlkp.c
+++ b/beecrypt/dlkp.c
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlkp.h b/beecrypt/dlkp.h
index 85581a414..e2929bfdf 100644
--- a/beecrypt/dlkp.h
+++ b/beecrypt/dlkp.h
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlpk.c b/beecrypt/dlpk.c
index eaa3e4457..4453befab 100644
--- a/beecrypt/dlpk.c
+++ b/beecrypt/dlpk.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlpk.h b/beecrypt/dlpk.h
index bea7bbb07..67e64d35d 100644
--- a/beecrypt/dlpk.h
+++ b/beecrypt/dlpk.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlsvdp-dh.c b/beecrypt/dlsvdp-dh.c
index 837b9943e..0082130fb 100644
--- a/beecrypt/dlsvdp-dh.c
+++ b/beecrypt/dlsvdp-dh.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dlsvdp-dh.h b/beecrypt/dlsvdp-dh.h
index ba6445f6a..3693dd983 100644
--- a/beecrypt/dlsvdp-dh.h
+++ b/beecrypt/dlsvdp-dh.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index 9f6b9255f..75e6c533a 100644
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/dsa.h b/beecrypt/dsa.h
index 2ff24e13b..dc47fc01e 100644
--- a/beecrypt/dsa.h
+++ b/beecrypt/dsa.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/elgamal.c b/beecrypt/elgamal.c
index 6ef34e267..6d02926e9 100644
--- a/beecrypt/elgamal.c
+++ b/beecrypt/elgamal.c
@@ -35,7 +35,7 @@
  */
 
 /*
- * Copyright (c) 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h
index 5f5cc0646..4db376ef3 100644
--- a/beecrypt/elgamal.h
+++ b/beecrypt/elgamal.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/entropy.h b/beecrypt/entropy.h
index 08e8d3d6a..3bb2a1aa6 100644
--- a/beecrypt/entropy.h
+++ b/beecrypt/entropy.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1998, 1999, 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/fips186.c b/beecrypt/fips186.c
index ef67fc671..a6166156c 100644
--- a/beecrypt/fips186.c
+++ b/beecrypt/fips186.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1998, 1999, 2000 Virtual Unlimited B.V.
+ * Copyright (c) 1998, 1999, 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/fips186.h b/beecrypt/fips186.h
index 45d4e7a61..cb5d6d3c6 100644
--- a/beecrypt/fips186.h
+++ b/beecrypt/fips186.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1998, 1999, 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/hmacmd5.c b/beecrypt/hmacmd5.c
index cb979e60c..4909049ee 100644
--- a/beecrypt/hmacmd5.c
+++ b/beecrypt/hmacmd5.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/installgen.sh b/beecrypt/installgen.sh
index 8475dee7c..ca366bde0 100755
--- a/beecrypt/installgen.sh
+++ b/beecrypt/installgen.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
-rm -f ltconfig ltmain.sh
+libtoolize --force --copy
 aclocal
 autoheader
-automake -a
+automake -a Makefile docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile
 autoconf
diff --git a/beecrypt/md5.c b/beecrypt/md5.c
index de9cfd675..ec5a2f8f5 100644
--- a/beecrypt/md5.c
+++ b/beecrypt/md5.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/md5.h b/beecrypt/md5.h
index 0d40391b8..6bd0bbbbc 100644
--- a/beecrypt/md5.h
+++ b/beecrypt/md5.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/mp.c b/beecrypt/mp.c
index 38deebfd3..15a4151f8 100644
--- a/beecrypt/mp.c
+++ b/beecrypt/mp.c
@@ -1,11 +1,11 @@
 /** \ingroup MP_m
  * \file mp.c
  *
- * Multiprecision 2's complement integer routines for 32 bit cpu, code.
+ * Multiprecision integer routines.
  */
 
 /*
- * Copyright (c) 1997, 1998, 1999, 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/mp.h b/beecrypt/mp.h
index 24b26750f..5bceef0b0 100644
--- a/beecrypt/mp.h
+++ b/beecrypt/mp.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1997, 1998, 1999, 2000  Virtual Unlimited B.V.
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MP32_H
-#define _MP32_H
+#ifndef _MP_H
+#define _MP_H
 
 #include "beecrypt.h"
 
@@ -37,6 +37,50 @@
 
 #include "mpopt.h"
 
+#include <stdint.h>		/* XXX scaffolding. */
+#define	MP_WBITS	32	/* XXX scaffolding. */
+#define	HAVE_UINT64_T	1	/* XXX scaffolding. */
+
+#define MP_HWBITS	(MP_WBITS >> 1)
+#define MP_WBYTES	(MP_WBITS >> 3)
+#define MP_WNIBBLES	(MP_WBITS >> 2)
+
+#if (MP_WBITS == 64)
+# define MP_WORDS_TO_BITS(x)	((x) << 6)
+# define MP_WORDS_TO_NIBBLES(x)	((x) << 4)
+# define MP_WORDS_TO_BYTES(x)	((x) << 3)
+# define MP_BITS_TO_WORDS(x)	((x) >> 6)
+# define MP_NIBBLES_TO_WORDS(x)	((x) >> 4)
+# define MP_BYTES_TO_WORDS(x)	((x) >> 3)
+#elif (MP_WBITS == 32)
+# define MP_WORDS_TO_BITS(x)	((x) << 5)
+# define MP_WORDS_TO_NIBBLES(x)	((x) << 3)
+# define MP_WORDS_TO_BYTES(x)	((x) << 2)
+# define MP_BITS_TO_WORDS(x)	((x) >> 5) 
+# define MP_NIBBLES_TO_WORDS(x)	((x) >> 3)
+# define MP_BYTES_TO_WORDS(x)	((x) >> 2)
+#else
+# error
+#endif
+
+#if (MP_WBITS == 64)
+typedef uint64_t mpw;
+typedef uint32_t mphw;
+#elif (MP_WBITS == 32)
+# if HAVE_UINT64_T
+#  define HAVE_MPDW 1
+typedef uint64_t mpdw;
+# endif
+typedef uint32_t mpw;
+typedef uint16_t mphw;
+#else
+# error
+#endif
+
+#define MP_MSBMASK	(((mpw) 0x1) << (MP_WBITS-1))
+#define MP_LSBMASK	 ((mpw) 0x1)
+#define MP_ALLMASK	~((mpw) 0x0)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/beecrypt/mpbarrett.h b/beecrypt/mpbarrett.h
index 077b3bf23..587ab0c51 100644
--- a/beecrypt/mpbarrett.h
+++ b/beecrypt/mpbarrett.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1997, 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MP32BARRETT_H
-#define _MP32BARRETT_H
+#ifndef _MPBARRETT_H
+#define _MPBARRETT_H
 
 #include "beecrypt.h"
 #include "mpnumber.h"
diff --git a/beecrypt/mpnumber.c b/beecrypt/mpnumber.c
index 090487eda..f40f4728f 100644
--- a/beecrypt/mpnumber.c
+++ b/beecrypt/mpnumber.c
@@ -7,7 +7,7 @@
 
 /*
  *
- * Copyright (c) 1997, 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/mpnumber.h b/beecrypt/mpnumber.h
index f8393c53d..9d5061a61 100644
--- a/beecrypt/mpnumber.h
+++ b/beecrypt/mpnumber.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1997, 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MP32NUMBER_H
-#define _MP32NUMBER_H
+#ifndef _MPNUMBER_H
+#define _MPNUMBER_H
 
 #include "types.h"
 
diff --git a/beecrypt/mpopt.h b/beecrypt/mpopt.h
index fcf06733f..b48288a32 100644
--- a/beecrypt/mpopt.h
+++ b/beecrypt/mpopt.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MP32OPT_H
-#define _MP32OPT_H
+#ifndef _MPOPT_H
+#define _MPOPT_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/beecrypt/mpprime.c b/beecrypt/mpprime.c
index a39183ed9..aea55e2e0 100644
--- a/beecrypt/mpprime.c
+++ b/beecrypt/mpprime.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/mpprime.h b/beecrypt/mpprime.h
index d8aa9a6c8..cb9f8fac9 100644
--- a/beecrypt/mpprime.h
+++ b/beecrypt/mpprime.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2003 Bob Deblier
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MP32PRIME_H
-#define _MP32PRIME_H
+#ifndef _MPPRIME_H
+#define _MPPRIME_H
 
 #include "mpbarrett.h"
 
diff --git a/beecrypt/mtprng.c b/beecrypt/mtprng.c
index d4b0d283b..8e51cbe50 100644
--- a/beecrypt/mtprng.c
+++ b/beecrypt/mtprng.c
@@ -15,7 +15,8 @@
  *
  */
 
-/* Copyright (c) 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+/*
+ * Copyright (c) 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/mtprng.h b/beecrypt/mtprng.h
index eef49911d..cc4669510 100644
--- a/beecrypt/mtprng.h
+++ b/beecrypt/mtprng.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1998, 1999, 2000 Virtual Unlimited B.V.
+ * Copyright (c) 1998, 1999, 2000, 2003 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsa.c b/beecrypt/rsa.c
index 3828b7c57..8c8dcb531 100644
--- a/beecrypt/rsa.c
+++ b/beecrypt/rsa.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsa.h b/beecrypt/rsa.h
index 6cf408196..c4a97754b 100644
--- a/beecrypt/rsa.h
+++ b/beecrypt/rsa.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsakp.c b/beecrypt/rsakp.c
index 4dd296d72..1e121dd1b 100644
--- a/beecrypt/rsakp.c
+++ b/beecrypt/rsakp.c
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsakp.h b/beecrypt/rsakp.h
index 9fdc0fb46..843352dae 100644
--- a/beecrypt/rsakp.h
+++ b/beecrypt/rsakp.h
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsapk.c b/beecrypt/rsapk.c
index 148404b8f..de9f394de 100644
--- a/beecrypt/rsapk.c
+++ b/beecrypt/rsapk.c
@@ -7,7 +7,7 @@
 /*
  * <conformance statement for IEEE P1363 needed here>
  *
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/rsapk.h b/beecrypt/rsapk.h
index 233c66306..81b8a0995 100644
--- a/beecrypt/rsapk.h
+++ b/beecrypt/rsapk.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/sha1.h b/beecrypt/sha1.h
index 8705b5b57..aa85263dd 100644
--- a/beecrypt/sha1.h
+++ b/beecrypt/sha1.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 1997, 1998, 1999, 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 1997, 1998, 1999, 2000, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/sha1opt.h b/beecrypt/sha1opt.h
index 2b2e607dc..3c77b6ff5 100644
--- a/beecrypt/sha1opt.h
+++ b/beecrypt/sha1opt.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2003 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/sha256.h b/beecrypt/sha256.h
index 7817106f3..f553570d6 100644
--- a/beecrypt/sha256.h
+++ b/beecrypt/sha256.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2000, 2001 Virtual Unlimited B.V.
+ * Copyright (c) 2000, 2001, 2002 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *
diff --git a/beecrypt/tests/Makefile.am b/beecrypt/tests/Makefile.am
index f9c8732e4..1fd5607b3 100644
--- a/beecrypt/tests/Makefile.am
+++ b/beecrypt/tests/Makefile.am
@@ -1,9 +1,9 @@
 #
 # Makefile.am's purpose is to build the beetest_ test_ program.
 #
-# Copyright (c) 2001, 2002 Virtual Unlimited B.V.
+# Copyright (c) 2001, 2002, 2003 Virtual Unlimited B.V.
 #
-# Author: Bob Deblier <bob@virtualunlimited.com>
+# Author: Bob Deblier <bob.deblier@pandora.be>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testdldp.c b/beecrypt/tests/testdldp.c
index 72848ffce..0a507e99e 100644
--- a/beecrypt/tests/testdldp.c
+++ b/beecrypt/tests/testdldp.c
@@ -4,7 +4,7 @@
  * Unit test program for discrete logarithm domain parameters (over a prime field),
  * as specified by IEEE P.1363.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testdsa.c b/beecrypt/tests/testdsa.c
index 319ea64c4..bd0167468 100644
--- a/beecrypt/tests/testdsa.c
+++ b/beecrypt/tests/testdsa.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for DSA.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testhmacmd5.c b/beecrypt/tests/testhmacmd5.c
index 2ea7b6e5c..6abba44e8 100644
--- a/beecrypt/tests/testhmacmd5.c
+++ b/beecrypt/tests/testhmacmd5.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for HMAC-MD5; it tests all vectors specified by RFC 2202.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testhmacsha1.c b/beecrypt/tests/testhmacsha1.c
index 49b987344..ceaeeb28e 100644
--- a/beecrypt/tests/testhmacsha1.c
+++ b/beecrypt/tests/testhmacsha1.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for HMAC-SHA1; it tests all vectors specified by RFC 2202.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testmd5.c b/beecrypt/tests/testmd5.c
index 5cb1fa64e..53c43d885 100644
--- a/beecrypt/tests/testmd5.c
+++ b/beecrypt/tests/testmd5.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for MD5; it tests all vectors specified by RFC 1321.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testsha1.c b/beecrypt/tests/testsha1.c
index 83c8b1fc9..597bdb529 100644
--- a/beecrypt/tests/testsha1.c
+++ b/beecrypt/tests/testsha1.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for SHA-1; it tests all but one of vectors specified by FIPS PUB 180-1.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/tests/testsha256.c b/beecrypt/tests/testsha256.c
index 4ec0917ca..b616ad700 100644
--- a/beecrypt/tests/testsha256.c
+++ b/beecrypt/tests/testsha256.c
@@ -3,7 +3,7 @@
  *
  * Unit test program for SHA-256; it implements the test vectors from the draft FIPS document.
  *
- * Copyright (c) 2002 Bob Deblier
+ * Copyright (c) 2002, 2003 Bob Deblier <bob.deblier@pandora.be>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/beecrypt/timestamp.c b/beecrypt/timestamp.c
index 50339c2f8..65da07329 100644
--- a/beecrypt/timestamp.c
+++ b/beecrypt/timestamp.c
@@ -3,7 +3,7 @@
  *
  * Java compatible 64-bit timestamp, code
  *
- * Copyright (c) 1999, 2000, 2002 Virtual Unlimited B.V.
+ * Copyright (c) 1999, 2000, 2002, 2003 Virtual Unlimited B.V.
  *
  * Author: Bob Deblier <bob@virtualunlimited.com>
  *