Merged back some changes fron gnupg. Fixed doc building.

83 files changed, 869 insertions, 663 deletions

diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index a9ce8dea..2730fb1b 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-28  Werner Koch  <wk@gnupg.org>
+
+	* mpicoder.c (mpi_fromstr): Made static and assume that all input
+	is in hexformat.
+
+	Updated all CPU specific code with the one from GnuPG-1.0.5.  This
+	is just a change of text formatting and the use of .label
+	instead of labels for hppa and pa7100.
+
+	* longlong.h: Fixes for ARM by Phil Blundell.
+
 2001-03-29  Werner Koch  <wk@gnupg.org>
 
 	* mpi-mul.c (mpi_mul): Make sure that secret temporary results are
diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S
index dc3bcfbb..a2ee8eb1 100644
--- a/mpi/alpha/mpih-add1.S
+++ b/mpi/alpha/mpih-add1.S
@@ -1,17 +1,15 @@
 /* alpha  add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
+ * Copyright (C) 1995, 1998, 2001 Free Software Foundation, Inc.
  *
- *	Copyright (C) 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ * This file is part of GnuPG.
  *
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/mpih-lshift.S b/mpi/alpha/mpih-lshift.S
index 9688588f..4ce4879a 100644
--- a/mpi/alpha/mpih-lshift.S
+++ b/mpi/alpha/mpih-lshift.S
@@ -1,15 +1,16 @@
-/* alpha    lshift
- *	Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+/* alpha - left shift
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1994, 1995, 1998, 2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/mpih-mul1.S b/mpi/alpha/mpih-mul1.S
index 5b24d98d..e62ccbdb 100644
--- a/mpi/alpha/mpih-mul1.S
+++ b/mpi/alpha/mpih-mul1.S
@@ -1,16 +1,17 @@
 /* Alpha 21064 mpih-mul1.S -- Multiply a limb vector with a limb and store
  *			      the result in a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+                      2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/mpih-mul2.S b/mpi/alpha/mpih-mul2.S
index 0c8d361c..595af99d 100644
--- a/mpi/alpha/mpih-mul2.S
+++ b/mpi/alpha/mpih-mul2.S
@@ -1,16 +1,17 @@
 /* Alpha 21064 addmul_1 -- Multiply a limb vector with a limb and add
  *			   the result to a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/mpih-mul3.S b/mpi/alpha/mpih-mul3.S
index bdf16b57..fa3df92a 100644
--- a/mpi/alpha/mpih-mul3.S
+++ b/mpi/alpha/mpih-mul3.S
@@ -1,15 +1,16 @@
 /* Alpha 21064	submul_1 -- Multiply a limb vector with a limb and
  *			    subtract the result from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/mpih-rshift.S b/mpi/alpha/mpih-rshift.S
index e93315ae..e15542de 100644
--- a/mpi/alpha/mpih-rshift.S
+++ b/mpi/alpha/mpih-rshift.S
@@ -1,6 +1,6 @@
 /* alpha    rshift
- *	Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1994, 1995, 1998, 1999,
+ *                    2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
diff --git a/mpi/alpha/mpih-sub1.S b/mpi/alpha/mpih-sub1.S
index bf614309..a32b470e 100644
--- a/mpi/alpha/mpih-sub1.S
+++ b/mpi/alpha/mpih-sub1.S
@@ -1,15 +1,16 @@
 /* Alpha  sub_n -- Subtract two limb vectors of the same length > 0 and
  *		  store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/alpha/udiv-qrnnd.S b/mpi/alpha/udiv-qrnnd.S
index 487991cd..0079c3ca 100644
--- a/mpi/alpha/udiv-qrnnd.S
+++ b/mpi/alpha/udiv-qrnnd.S
@@ -1,16 +1,16 @@
 /* Alpha 21064 __udiv_qrnnd
  *
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (c) 1997 by Werner Koch (dd9jn)
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
index 3bd1b611..13424e28 100644
--- a/mpi/generic/mpi-asm-defs.h
+++ b/mpi/generic/mpi-asm-defs.h
@@ -6,3 +6,5 @@
 
 
 
+
+
diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c
index e66c6686..d9c3cbb6 100644
--- a/mpi/generic/mpih-add1.c
+++ b/mpi/generic/mpih-add1.c
@@ -1,15 +1,15 @@
 /* mpihelp-add_1.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 
+ *               2000 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpih-lshift.c b/mpi/generic/mpih-lshift.c
index 698cd38d..fba8c052 100644
--- a/mpi/generic/mpih-lshift.c
+++ b/mpi/generic/mpih-lshift.c
@@ -1,14 +1,14 @@
 /* mpihelp-lshift.c  -	MPI helper functions
- *	Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c
index e84eccce..83a81add 100644
--- a/mpi/generic/mpih-mul1.c
+++ b/mpi/generic/mpih-mul1.c
@@ -1,15 +1,14 @@
 /* mpihelp-mul_1.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c
index d77ec802..ff8f998f 100644
--- a/mpi/generic/mpih-mul2.c
+++ b/mpi/generic/mpih-mul2.c
@@ -1,15 +1,14 @@
 /* mpihelp-mul_2.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c
index c7c4e189..80eedcc4 100644
--- a/mpi/generic/mpih-mul3.c
+++ b/mpi/generic/mpih-mul3.c
@@ -1,15 +1,14 @@
 /* mpihelp-mul_3.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/mpih-rshift.c b/mpi/generic/mpih-rshift.c
index d8ca35f1..be73adfb 100644
--- a/mpi/generic/mpih-rshift.c
+++ b/mpi/generic/mpih-rshift.c
@@ -1,5 +1,6 @@
 /* mpih-rshift.c  -  MPI helper functions
- *	Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ *               2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG
  *
diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c
index 2c38ff06..c618fee4 100644
--- a/mpi/generic/mpih-sub1.c
+++ b/mpi/generic/mpih-sub1.c
@@ -1,15 +1,14 @@
 /* mpihelp-add_2.c  -  MPI helper functions
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/generic/udiv-w-sdiv.c b/mpi/generic/udiv-w-sdiv.c
index 1e9e79d2..dd028503 100644
--- a/mpi/generic/udiv-w-sdiv.c
+++ b/mpi/generic/udiv-w-sdiv.c
@@ -1,18 +1,16 @@
 /* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
  *			  division.
- *
- * Contributed by Peter L. Montgomery.
- *
  * Copyright (C) 1992, 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Contributed by Peter L. Montgomery.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S
index e01c2eed..7a2a2c2c 100644
--- a/mpi/hppa/mpih-add1.S
+++ b/mpi/hppa/mpih-add1.S
@@ -1,17 +1,17 @@
 /* hppa add_n -- Add two limb vectors of the same length > 0 and store
  *		 sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Fee Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -45,7 +45,7 @@
 
 	.code
 	.export 	mpihelp_add_n
-mpihelp_add_n
+	.label		mpihelp_add_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -56,13 +56,15 @@ mpihelp_add_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 add		%r20,%r19,%r28	; add first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 addc		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label L$end
+	stws		%r28,0(0,%r26)
 	bv		0(%r2)
 	 addc		%r0,%r0,%r28
 
diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S
index ada09f59..6a8b2c4c 100644
--- a/mpi/hppa/mpih-lshift.S
+++ b/mpi/hppa/mpih-lshift.S
@@ -1,15 +1,16 @@
 /* hppa   lshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -31,7 +32,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -47,7 +48,8 @@ mpihelp_lshift
 	addib,= 	-1,%r24,L$0002
 	vshd		%r22,%r29,%r20
 
-L$loop	ldws,mb 	-4(0,%r25),%r22
+	.label	L$loop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,= 	-1,%r24,L$0003
 	vshd		%r29,%r22,%r20
@@ -56,12 +58,15 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,<>	-1,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$0002	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0002
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$0003	stws,mb 	%r20,-4(0,%r26)
-L$0004	vshd		%r22,%r0,%r20
+	.label	L$0003
+	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0004
+	vshd		%r22,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
 
diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S
index 0299d2e2..b1e6a679 100644
--- a/mpi/hppa/mpih-rshift.S
+++ b/mpi/hppa/mpih-rshift.S
@@ -1,15 +1,16 @@
 /* hppa   rshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -32,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_rshift
-mpihelp_rshift
+	.label		mpihelp_rshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -45,7 +46,8 @@ mpihelp_rshift
 	addib,= 	-1,%r24,L$r002
 	vshd		%r29,%r22,%r20
 
-L$roop	ldws,ma 	4(0,%r25),%r22
+	.label	L$roop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,= 	-1,%r24,L$r003
 	vshd		%r22,%r29,%r20
@@ -54,12 +56,15 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,<>	-1,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$r002	stws,ma 	%r20,4(0,%r26)
+	.label	L$r002
+	stws,ma 	%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$r003	stws,ma 	%r20,4(0,%r26)
-L$r004	vshd		%r0,%r22,%r20
+	.label	L$r003
+	stws,ma 	%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
 
diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S
index 8672e314..870009e9 100644
--- a/mpi/hppa/mpih-sub1.S
+++ b/mpi/hppa/mpih-sub1.S
@@ -1,16 +1,17 @@
 /* hppa   sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -48,7 +49,7 @@
 
 	.code
 	.export 	mpihelp_sub_n
-mpihelp_sub_n
+	.label		mpihelp_sub_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -59,13 +60,15 @@ mpihelp_sub_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 sub		%r20,%r19,%r28	; subtract first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label	L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 subb		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label	L$end
+	stws		%r28,0(0,%r26)
 	addc		%r0,%r0,%r28
 	bv		0(%r2)
 	 subi		1,%r28,%r28
diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S
index 84923834..c8a52412 100644
--- a/mpi/hppa/udiv-qrnnd.S
+++ b/mpi/hppa/udiv-qrnnd.S
@@ -1,17 +1,16 @@
 /* HP-PA  __udiv_qrnnd division support, used from longlong.h.
  *	  This version runs fast on pre-PA7000 CPUs.
  *
- *	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
+ *      Copyright (C) 1993, 1994, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -44,7 +43,7 @@
 
 	.code
 	.export 	__udiv_qrnnd
-__udiv_qrnnd
+	.label		__udiv_qrnnd
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -122,7 +121,7 @@ __udiv_qrnnd
 	bv		0(%r2)
 	 addc		%r28,%r28,%r28
 
-L$largedivisor
+	.label	L$largedivisor
 	extru		%r24,31,1,%r19		; r19 = n0 & 1
 	bb,<		%r23,31,L$odd
 	 extru		%r23,30,31,%r22 	; r22 = d >> 1
@@ -201,7 +200,8 @@ L$largedivisor
 	bv		0(%r2)
 	 addc		%r24,%r24,%r28
 
-L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
+	.label	L$odd
+	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 	shd		%r25,%r24,1,%r24	; r24 = new n0
 	extru		%r25,30,31,%r25 	; r25 = new n1
 	sub		%r0,%r22,%r21
@@ -286,7 +286,8 @@ L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 
 ; This is just a special case of the code above.
 ; We come here when d == 0xFFFFFFFF
-L$FF..	add,uv		%r25,%r24,%r24
+	.label	L$FF..
+	add,uv		%r25,%r24,%r24
 	sub,<<		%r24,%r23,%r0
 	ldo		1(%r24),%r24
 	stws		%r24,0(0,%r26)
diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S
index 1f737747..ac9baced 100644
--- a/mpi/hppa1.1/mpih-mul1.S
+++ b/mpi/hppa1.1/mpih-mul1.S
@@ -1,16 +1,17 @@
 /* hppa1.1  mul_1 -- Multiply a limb vector with a limb and store
  *		     the result in a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -58,7 +59,7 @@
 
 	.code
 	.export 	mpihelp_mul_1
-mpihelp_mul_1
+	.label		mpihelp_mul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -81,7 +82,8 @@ mpihelp_mul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	fldws,ma	4(%r25),%fr5
+	.label	L$loop
+	fldws,ma	4(%r25),%fr5
 	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
 	xmpyu		%fr4,%fr5,%fr6
@@ -90,7 +92,8 @@ L$loop	fldws,ma	4(%r25),%fr5
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	stws,ma 	%r19,4(%r26)
+	.label	L$end
+	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
 	ldw		-16(%r30),%r28
 	stws,ma 	%r19,4(%r26)
@@ -98,7 +101,7 @@ L$end	stws,ma 	%r19,4(%r26)
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label	L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	fstds		%fr6,-16(%r30)
 	ldw		-16(%r30),%r28
diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S
index 89c02595..c73397e3 100644
--- a/mpi/hppa1.1/mpih-mul2.S
+++ b/mpi/hppa1.1/mpih-mul2.S
@@ -1,16 +1,17 @@
 /* hppa1.1   addmul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -48,7 +49,7 @@
 
 	.code
 	.export 	mpihelp_addmul_1
-mpihelp_addmul_1
+	.label		mpihelp_addmul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -71,7 +72,8 @@ mpihelp_addmul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	ldws		0(%r26),%r29
+	.label	L$loop
+	ldws		0(%r26),%r29
 	fldws,ma	4(%r25),%fr5
 	add		%r29,%r19,%r19
 	stws,ma 	%r19,4(%r26)
@@ -83,7 +85,8 @@ L$loop	ldws		0(%r26),%r29
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	ldw		0(%r26),%r29
+	.label	L$end
+	ldw		0(%r26),%r29
 	add		%r29,%r19,%r19
 	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
@@ -96,7 +99,7 @@ L$end	ldw		0(%r26),%r29
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	ldw		0(%r26),%r29
 	fstds		%fr6,-16(%r30)
diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S
index 80868a3e..f9ccb1b5 100644
--- a/mpi/hppa1.1/mpih-mul3.S
+++ b/mpi/hppa1.1/mpih-mul3.S
@@ -1,16 +1,17 @@
 /* hppa1.1   submul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
- *	Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -55,7 +56,7 @@
 
 	.code
 	.export 	mpihelp_submul_1
-mpihelp_submul_1
+	.label		mpihelp_submul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -78,7 +79,8 @@ mpihelp_submul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	ldws		0(%r26),%r29
+	.label	L$loop
+	ldws		0(%r26),%r29
 	fldws,ma	4(%r25),%fr5
 	sub		%r29,%r19,%r22
 	add		%r22,%r19,%r0
@@ -91,7 +93,8 @@ L$loop	ldws		0(%r26),%r29
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	ldw		0(%r26),%r29
+	.label	L$end
+	ldw		0(%r26),%r29
 	sub		%r29,%r19,%r22
 	add		%r22,%r19,%r0
 	stws,ma 	%r22,4(%r26)
@@ -106,7 +109,7 @@ L$end	ldw		0(%r26),%r29
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label	L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	ldw		0(%r26),%r29
 	fstds		%fr6,-16(%r30)
diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S
index b48eee49..a1643d70 100644
--- a/mpi/hppa1.1/udiv-qrnnd.S
+++ b/mpi/hppa1.1/udiv-qrnnd.S
@@ -1,17 +1,17 @@
 /* HP-PA  __udiv_qrnnd division support, used from longlong.h.
  *	  This version runs fast on PA 7000 and later.
  *
- *	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -39,10 +39,11 @@
  */
 
 	.code
-L$0000	.word		0x43f00000
+	.label L$0000
+	.word		0x43f00000
 	.word		0x0
 	.export 	__udiv_qrnnd
-__udiv_qrnnd
+	.label		__udiv_qrnnd
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -58,7 +59,7 @@ __udiv_qrnnd
 	fcnvxf,dbl,dbl	%fr5,%fr5
 	fldds		0(0,%r19),%fr4
 	fadd,dbl	%fr4,%fr5,%fr5
-L$1
+	.label	L$1
 	fcpy,sgl	%fr0,%fr6L
 	fldws		-12(0,%r30),%fr6R
 	fcnvxf,dbl,dbl	%fr6,%fr4
@@ -79,7 +80,8 @@ L$1
 
 	add		%r22,%r23,%r22
 	ldo		-1(%r28),%r28
-L$2	bv		0(%r2)
+	.label	L$2
+	bv		0(%r2)
 	stws		%r22,0(0,%r26)
 
 	.exit
diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S
index b7517cf0..3b3b23c8 100644
--- a/mpi/i386/mpih-add1.S
+++ b/mpi/i386/mpih-add1.S
@@ -1,17 +1,17 @@
 /* i80386 add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S
index a84f6b1f..5e6387a4 100644
--- a/mpi/i386/mpih-lshift.S
+++ b/mpi/i386/mpih-lshift.S
@@ -1,15 +1,15 @@
 /* i80386   lshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S
index 10679643..cf87046f 100644
--- a/mpi/i386/mpih-mul1.S
+++ b/mpi/i386/mpih-mul1.S
@@ -1,16 +1,16 @@
 /* i80386 mul_1 -- Multiply a limb vector with a limb and store
  *			 the result in a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S
index 8b124bda..f134af70 100644
--- a/mpi/i386/mpih-mul2.S
+++ b/mpi/i386/mpih-mul2.S
@@ -1,16 +1,17 @@
 /* i80386 addmul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S
index 5f365561..2907ed03 100644
--- a/mpi/i386/mpih-mul3.S
+++ b/mpi/i386/mpih-mul3.S
@@ -1,16 +1,17 @@
 /* i80386 submul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S
index 3dd9caf7..9718204c 100644
--- a/mpi/i386/mpih-rshift.S
+++ b/mpi/i386/mpih-rshift.S
@@ -1,15 +1,16 @@
 /* i80386   rshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S
index fe1cdeee..169c5395 100644
--- a/mpi/i386/mpih-sub1.S
+++ b/mpi/i386/mpih-sub1.S
@@ -1,16 +1,17 @@
 /* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index 33bd2947..5a2c7b23 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -1,24 +1,30 @@
-/* asm.h -- Definitions for x86 syntax variations.
-
-Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.  */
-
+/* syntax.h -- Definitions for x86 syntax variations.
+ *
+ *       Copyright (C) 1992, 1994, 1995, 1998, 
+ *                     2001 Free Software Foundation, Inc.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 #undef ALIGN
 
diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S
index a52c1646..248b0c0b 100644
--- a/mpi/i586/mpih-add1.S
+++ b/mpi/i586/mpih-add1.S
@@ -1,16 +1,17 @@
 /* i80586 add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-lshift.S b/mpi/i586/mpih-lshift.S
index 9e0cb029..ed040912 100644
--- a/mpi/i586/mpih-lshift.S
+++ b/mpi/i586/mpih-lshift.S
@@ -1,15 +1,16 @@
 /* i80586   lshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S
index b338b1a8..42bcde6b 100644
--- a/mpi/i586/mpih-mul1.S
+++ b/mpi/i586/mpih-mul1.S
@@ -1,15 +1,17 @@
 /* i80586 mul_1 -- Multiply a limb vector with a limb and store
  *			 the result in a second limb vector.
- *	Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S
index df22a428..54c5df96 100644
--- a/mpi/i586/mpih-mul2.S
+++ b/mpi/i586/mpih-mul2.S
@@ -1,16 +1,17 @@
 /* i80586 addmul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S
index 014e33cb..0d61ff26 100644
--- a/mpi/i586/mpih-mul3.S
+++ b/mpi/i586/mpih-mul3.S
@@ -1,16 +1,17 @@
 /* i80586 submul_1 -- Multiply a limb vector with a limb and add
  *		      the result to a second limb vector.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-rshift.S b/mpi/i586/mpih-rshift.S
index aec26e64..2e331621 100644
--- a/mpi/i586/mpih-rshift.S
+++ b/mpi/i586/mpih-rshift.S
@@ -1,15 +1,16 @@
 /* i80586   rshift
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S
index 2ed704e8..a54be0e9 100644
--- a/mpi/i586/mpih-sub1.S
+++ b/mpi/i586/mpih-sub1.S
@@ -1,16 +1,17 @@
 /* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/longlong.h b/mpi/longlong.h
index e36beae4..84020773 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -1,7 +1,8 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-   Note: I added some stuff for use with g10
+   Note: I added some stuff for use with gnupg
 
-Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998,
+              2000, 2001 Free Software Foundation, Inc.
 
 This file is free software; you can redistribute it and/or modify
 it under the terms of the GNU Library General Public License as published by
@@ -199,28 +200,27 @@ extern UDItype __udiv_qrnnd ();
 	     "rI" ((USItype)(bh)),                                      \
 	     "r" ((USItype)(al)),                                       \
 	     "rI" ((USItype)(bl)))
-#ifdef __ARM_ARCH_3__
-/* SAM This does not work on arm4 */
+#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
-	mov	%|r0, %2, lsr #16
-	mov	%|r2, %3, lsr #16
-	bic	%|r1, %2, %|r0, lsl #16
-	bic	%|r2, %3, %|r2, lsl #16
-	mul	%1, %|r1, %|r2
-	mul	%|r2, %|r0, %|r2
-	mul	%|r1, %0, %|r1
-	mul	%0, %|r0, %0
-	adds	%|r1, %|r2, %|r1
-	addcs	%0, %0, #65536
-	adds	%1, %1, %|r1, lsl #16
-	adc	%0, %0, %|r1, lsr #16"                                  \
+	mov	%|r0, %2, lsr #16		@ AAAA
+	mov	%|r2, %3, lsr #16		@ BBBB
+	bic	%|r1, %2, %|r0, lsl #16		@ aaaa
+	bic	%0, %3, %|r2, lsl #16		@ bbbb
+	mul	%1, %|r1, %|r2			@ aaaa * BBBB
+	mul	%|r2, %|r0, %|r2		@ AAAA * BBBB
+	mul	%|r1, %0, %|r1			@ aaaa * bbbb
+	mul	%0, %|r0, %0			@ AAAA * bbbb
+	adds	%|r0, %1, %0			@ central sum
+	addcs	%|r2, %|r2, #65536
+	adds	%1, %|r1, %|r0, lsl #16
+	adc	%0, %|r2, %|r0, lsr #16"                                \
 	   : "=&r" ((USItype)(xh)),                                     \
 	     "=r" ((USItype)(xl))                                       \
 	   : "r" ((USItype)(a)),                                        \
 	     "r" ((USItype)(b))                                         \
 	   : "r0", "r1", "r2")
-#elif __ARM_ARCH_4__
+#else
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
 	umull	%r1, %r0, %r2, %r3" \
@@ -229,8 +229,6 @@ extern UDItype __udiv_qrnnd ();
 		   : "r" ((USItype)(a)), \
 		     "r" ((USItype)(b)) \
 		   : "r0", "r1")
-#else
-#error Untested architecture
 #endif
 #define UMUL_TIME 20
 #define UDIV_TIME 100
diff --git a/mpi/m68k/mc68020/mpih-mul1.S b/mpi/m68k/mc68020/mpih-mul1.S
index 16a52a22..4872b9ba 100644
--- a/mpi/m68k/mc68020/mpih-mul1.S
+++ b/mpi/m68k/mc68020/mpih-mul1.S
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_mul_1 -- Multiply a limb vector with a limb and store
-   the result in a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                        the result in a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 
diff --git a/mpi/m68k/mc68020/mpih-mul2.S b/mpi/m68k/mc68020/mpih-mul2.S
index 8cbbc548..7c492ffb 100644
--- a/mpi/m68k/mc68020/mpih-mul2.S
+++ b/mpi/m68k/mc68020/mpih-mul2.S
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_addmul_1 -- Multiply a limb vector with a limb and add
-   the result to a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                           the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 #include "sysdep.h"
diff --git a/mpi/m68k/mc68020/mpih-mul3.S b/mpi/m68k/mc68020/mpih-mul3.S
index 8e28ce45..1e4ac45d 100644
--- a/mpi/m68k/mc68020/mpih-mul3.S
+++ b/mpi/m68k/mc68020/mpih-mul3.S
@@ -1,24 +1,34 @@
 /* mc68020 __mpn_submul_1 -- Multiply a limb vector with a limb and subtract
-   the result from a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
+ *                           the result from a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
 
 
 
diff --git a/mpi/m68k/mpih-add1.S b/mpi/m68k/mpih-add1.S
index b3812c78..1e9cc640 100644
--- a/mpi/m68k/mpih-add1.S
+++ b/mpi/m68k/mpih-add1.S
@@ -1,24 +1,33 @@
 /* mc68020 __mpn_add_n -- Add two limb vectors of the same length > 0 and store
-   sum in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ *                        sum in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994,1996, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 #include "sysdep.h"
diff --git a/mpi/m68k/mpih-lshift.S b/mpi/m68k/mpih-lshift.S
index af305c84..cc9dfba6 100644
--- a/mpi/m68k/mpih-lshift.S
+++ b/mpi/m68k/mpih-lshift.S
@@ -1,24 +1,32 @@
 /* mc68020 lshift -- Shift left a low-level natural-number integer.
+ *
+ *      Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1996, 1998 Free Software Foundation, Inc.
-
-This file is part of GNUPG.
-
-GNUPG is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNUPG 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff --git a/mpi/m68k/mpih-rshift.S b/mpi/m68k/mpih-rshift.S
index 5670888c..cc86166a 100644
--- a/mpi/m68k/mpih-rshift.S
+++ b/mpi/m68k/mpih-rshift.S
@@ -1,24 +1,32 @@
 /* mc68020 rshift -- Shift right a low-level natural-number integer.
+ *
+ *      Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1996, 1998 Free Software Foundation, Inc.
-
-This file is part of GNUPG.
-
-GNUPG is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNUPG 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff --git a/mpi/m68k/mpih-sub1.S b/mpi/m68k/mpih-sub1.S
index 8d8ef0b4..1847fbd6 100644
--- a/mpi/m68k/mpih-sub1.S
+++ b/mpi/m68k/mpih-sub1.S
@@ -1,25 +1,33 @@
 /* mc68020 __mpn_sub_n -- Subtract two limb vectors of the same length > 0 and
-   store difference in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
+ *                        store difference in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff --git a/mpi/m68k/syntax.h b/mpi/m68k/syntax.h
index 9d6f3522..316518fe 100644
--- a/mpi/m68k/syntax.h
+++ b/mpi/m68k/syntax.h
@@ -1,23 +1,33 @@
 /* asm.h -- Definitions for 68k syntax variations.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.  */
 
 #undef ALIGN
 
diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S
index 7ac5f38b..a998420d 100644
--- a/mpi/mips3/mpih-add1.S
+++ b/mpi/mips3/mpih-add1.S
@@ -1,15 +1,17 @@
 /* mips3  add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S
index 37e9a5e1..112383f9 100644
--- a/mpi/mips3/mpih-lshift.S
+++ b/mpi/mips3/mpih-lshift.S
@@ -1,14 +1,16 @@
 /* mips3    lshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S
index fd349ee9..70409e8d 100644
--- a/mpi/mips3/mpih-mul1.S
+++ b/mpi/mips3/mpih-mul1.S
@@ -1,15 +1,17 @@
 /* mips3 mpih-mul1.S -- Multiply a limb vector with a limb and store
  *			the result in a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_mul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -64,7 +66,7 @@ Loop:	mflo	$10
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
@@ -74,7 +76,7 @@ $LC1:	mflo	$10
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S
index 1474b4f0..1bddd053 100644
--- a/mpi/mips3/mpih-mul2.S
+++ b/mpi/mips3/mpih-mul2.S
@@ -1,15 +1,17 @@
 /* MIPS3   addmul_1 -- Multiply a limb vector with a single limb and
  *		       add the product to a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_addmul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@ Loop:	ld	$10,0($4)
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@ $LC1:	ld	$10,0($4)
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S
index 4616732f..82fe47d5 100644
--- a/mpi/mips3/mpih-mul3.S
+++ b/mpi/mips3/mpih-mul3.S
@@ -1,15 +1,17 @@
 /* MIPS3 submul_1 -- Multiply a limb vector with a single limb and
  *		     subtract the product from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_submul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@ Loop:	ld	$10,0($4)
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@ $LC1:	ld	$10,0($4)
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S
index 7bc08450..74a6cc96 100644
--- a/mpi/mips3/mpih-rshift.S
+++ b/mpi/mips3/mpih-rshift.S
@@ -1,14 +1,16 @@
 /* mips3    rshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S
index 4bc3ad29..72f506ea 100644
--- a/mpi/mips3/mpih-sub1.S
+++ b/mpi/mips3/mpih-sub1.S
@@ -1,15 +1,17 @@
 /* mips3  sub_n -- Subtract two limb vectors of the same length > 0 and
  *		  store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * 
+ *      Copyright (C) 1995, 1998, 1999, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index 4c169875..aea641bb 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -75,12 +75,12 @@ mpi_read_from_buffer(byte *buffer, unsigned *ret_nread, int secure)
 
 
 /****************
- * Make an mpi from a character string.
+ * Make an mpi from a hex character string.
  */
-int
+static int
 mpi_fromstr(MPI val, const char *str)
 {
-    int hexmode=0, sign=0, prepend_zero=0, i, j, c, c1, c2;
+    int sign=0, prepend_zero=0, i, j, c, c1, c2;
     unsigned nbits, nbytes, nlimbs;
     mpi_limb_t a;
 
@@ -88,11 +88,11 @@ mpi_fromstr(MPI val, const char *str)
 	sign = 1;
 	str++;
     }
-    if( *str == '0' && str[1] == 'x' )
-	hexmode = 1;
-    else
-	return 1; /* other bases are not yet supported */
-    str += 2;
+
+    /* skip optional hex prefix */
+    if ( *str == '0' && str[1] == 'x' ) {
+        str += 2;
+    }
 
     nbits = strlen(str)*4;
     if( nbits % 8 )
diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S
index e17e1b70..76368fe7 100644
--- a/mpi/pa7100/mpih-lshift.S
+++ b/mpi/pa7100/mpih-lshift.S
@@ -1,16 +1,17 @@
 /* hppa   lshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
+ * 
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -32,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -48,7 +49,8 @@ mpihelp_lshift
 	addib,<=	-5,%r24,L$rest
 	vshd		%r22,%r29,%r20
 
-L$loop	ldws,mb 	-4(0,%r25),%r22
+	.label	L$loop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r22,%r20
 	ldws,mb 	-4(0,%r25),%r29
@@ -62,9 +64,11 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-4,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$rest	addib,= 	4,%r24,L$end1
+	.label	L$rest
+	addib,= 	4,%r24,L$end1
 	nop
-L$eloop ldws,mb 	-4(0,%r25),%r22
+	.label	L$eloop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,<=	-1,%r24,L$end2
 	vshd		%r29,%r22,%r20
@@ -73,12 +77,15 @@ L$eloop ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eloop
 	vshd		%r22,%r29,%r20
 
-L$end1	stws,mb 	%r20,-4(0,%r26)
+	.label	L$end1
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$end2	stws,mb 	%r20,-4(0,%r26)
-L$0004	vshd		%r22,%r0,%r20
+	.label	L$end2
+	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0004
+	vshd		%r22,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
 
diff --git a/mpi/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S
index b409de04..3bada7ce 100644
--- a/mpi/pa7100/mpih-rshift.S
+++ b/mpi/pa7100/mpih-rshift.S
@@ -1,16 +1,17 @@
 /* hppa   rshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
@@ -32,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_rshift
-mpihelp_rshift
+	.label		mpihelp_rshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -45,7 +46,8 @@ mpihelp_rshift
 	addib,<=	-5,%r24,L$rrest
 	vshd		%r29,%r22,%r20
 
-L$roop	ldws,ma 	4(0,%r25),%r22
+	.label	L$roop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	vshd		%r22,%r29,%r20
 	ldws,ma 	4(0,%r25),%r29
@@ -59,9 +61,11 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,> 	-4,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$rrest addib,= 	4,%r24,L$rend1
+	.label	L$rrest
+	addib,= 	4,%r24,L$rend1
 	nop
-L$eroop ldws,ma 	4(0,%r25),%r22
+	.label	L$eroop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,<=	-1,%r24,L$rend2
 	vshd		%r22,%r29,%r20
@@ -70,12 +74,15 @@ L$eroop ldws,ma 	4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eroop
 	vshd		%r29,%r22,%r20
 
-L$rend1  stws,ma	 %r20,4(0,%r26)
+	.label	L$rend1
+	stws,ma		%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$rend2  stws,ma	 %r20,4(0,%r26)
-L$r004	vshd		%r0,%r22,%r20
+	.label	L$rend2
+	stws,ma		%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
 
diff --git a/mpi/power/mpih-add1.S b/mpi/power/mpih-add1.S
index 27f8f666..7313ac61 100644
--- a/mpi/power/mpih-add1.S
+++ b/mpi/power/mpih-add1.S
@@ -1,15 +1,15 @@
 /* IBM POWER add_n -- Add two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1996, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-lshift.S b/mpi/power/mpih-lshift.S
index bb7a9dba..20cf4535 100644
--- a/mpi/power/mpih-lshift.S
+++ b/mpi/power/mpih-lshift.S
@@ -1,15 +1,15 @@
 /* IBM POWER lshift
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-mul1.S b/mpi/power/mpih-mul1.S
index 9daabe82..03fff4f9 100644
--- a/mpi/power/mpih-mul1.S
+++ b/mpi/power/mpih-mul1.S
@@ -1,16 +1,16 @@
 /* IBM POWER  mul_1 -- Multiply a limb vector with a limb and store
- * the result in a second limb vector.
+ *                     the result in a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-mul2.S b/mpi/power/mpih-mul2.S
index 8cf2ec08..3d7fc153 100644
--- a/mpi/power/mpih-mul2.S
+++ b/mpi/power/mpih-mul2.S
@@ -1,16 +1,16 @@
 /* IBM POWER addmul_1 -- Multiply a limb vector with a limb and add
  *			 the result to a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-mul3.S b/mpi/power/mpih-mul3.S
index 458b0038..f94018ca 100644
--- a/mpi/power/mpih-mul3.S
+++ b/mpi/power/mpih-mul3.S
@@ -1,16 +1,16 @@
 /* IBM POWER submul_1 -- Multiply a limb vector with a limb and subtract
  *			 the result from a second limb vector.
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-rshift.S b/mpi/power/mpih-rshift.S
index 6b79a1c3..04fb5942 100644
--- a/mpi/power/mpih-rshift.S
+++ b/mpi/power/mpih-rshift.S
@@ -1,15 +1,15 @@
 /* IBM POWER rshift
  *
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/power/mpih-sub1.S b/mpi/power/mpih-sub1.S
index f01839af..375a5be8 100644
--- a/mpi/power/mpih-sub1.S
+++ b/mpi/power/mpih-sub1.S
@@ -1,15 +1,16 @@
 /* IBM POWER sub_n -- Subtract two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1996, 1999
+ *                    Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-add1.S b/mpi/powerpc32/mpih-add1.S
index 2b22495e..81c4e20f 100644
--- a/mpi/powerpc32/mpih-add1.S
+++ b/mpi/powerpc32/mpih-add1.S
@@ -1,15 +1,15 @@
 /* PowerPC-32 add_n -- Add two limb vectors of equal, non-zero length.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-lshift.S b/mpi/powerpc32/mpih-lshift.S
index 8b5f2b21..20ca7f92 100644
--- a/mpi/powerpc32/mpih-lshift.S
+++ b/mpi/powerpc32/mpih-lshift.S
@@ -1,15 +1,15 @@
 /* PowerPC-32 lshift
  *
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-mul1.S b/mpi/powerpc32/mpih-mul1.S
index 5b88cf49..b3cb62f3 100644
--- a/mpi/powerpc32/mpih-mul1.S
+++ b/mpi/powerpc32/mpih-mul1.S
@@ -1,16 +1,17 @@
 /* PowerPC-32 mul_1 -- Multiply a limb vector with a limb and store
  *		       the result in a second limb vector.
  *
- * Copyright (C) 1993, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1993, 1994, 1995,
+ *                    1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-mul2.S b/mpi/powerpc32/mpih-mul2.S
index c7d00ab1..d3b39bc0 100644
--- a/mpi/powerpc32/mpih-mul2.S
+++ b/mpi/powerpc32/mpih-mul2.S
@@ -1,16 +1,16 @@
 /* PowerPC-32 addmul_1 -- Multiply a limb vector with a limb and add
  *			  the result to a second limb vector.
  *
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-mul3.S b/mpi/powerpc32/mpih-mul3.S
index 4c9d0588..d84f853b 100644
--- a/mpi/powerpc32/mpih-mul3.S
+++ b/mpi/powerpc32/mpih-mul3.S
@@ -1,16 +1,16 @@
 /* PowerPC-32 submul_1 -- Multiply a limb vector with a limb and subtract
  *			  the result from a second limb vector.
  *
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-rshift.S b/mpi/powerpc32/mpih-rshift.S
index bc786adb..e9704db9 100644
--- a/mpi/powerpc32/mpih-rshift.S
+++ b/mpi/powerpc32/mpih-rshift.S
@@ -1,15 +1,15 @@
 /* PowerPC-32 rshift
  *
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/powerpc32/mpih-sub1.S b/mpi/powerpc32/mpih-sub1.S
index 58fa83ff..8c67d988 100644
--- a/mpi/powerpc32/mpih-sub1.S
+++ b/mpi/powerpc32/mpih-sub1.S
@@ -1,16 +1,16 @@
 /* PowerPC-32  sub_n -- Subtract two limb vectors of the same length > 0
  *			and store difference in a third limb vector.
  *
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of Libgcrypt.
+ * This file is part of GnuPG.
  *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/sparc32/mpih-add1.S b/mpi/sparc32/mpih-add1.S
index b90d9d60..b8faadb5 100644
--- a/mpi/sparc32/mpih-add1.S
+++ b/mpi/sparc32/mpih-add1.S
@@ -1,16 +1,17 @@
 /* SPARC _add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/sparc32/mpih-lshift.S b/mpi/sparc32/mpih-lshift.S
index 5348a157..b217d5e6 100644
--- a/mpi/sparc32/mpih-lshift.S
+++ b/mpi/sparc32/mpih-lshift.S
@@ -1,15 +1,16 @@
 /* sparc lshift
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S
index e74675d1..62902cbe 100644
--- a/mpi/sparc32/mpih-rshift.S
+++ b/mpi/sparc32/mpih-rshift.S
@@ -1,15 +1,16 @@
 /* sparc rshift
  *
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG 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 General Public License for more details.
diff --git a/mpi/sparc32/udiv.S b/mpi/sparc32/udiv.S
index 3e2376cf..752d0719 100644
--- a/mpi/sparc32/udiv.S
+++ b/mpi/sparc32/udiv.S
@@ -1,24 +1,33 @@
-! SPARC v7 __udiv_qrnnd division support, used from longlong.h.
-! This is for v7 CPUs without a floating-point unit.
-
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
+/* SPARC v7 __udiv_qrnnd division support, used from longlong.h.
+ *           This is for v7 CPUs without a floating-point unit.
+ *
+ *      Copyright (C) 1993, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
 
 ! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul1.S b/mpi/sparc32v8/mpih-mul1.S
index 8bc1db57..55145006 100644
--- a/mpi/sparc32v8/mpih-mul1.S
+++ b/mpi/sparc32v8/mpih-mul1.S
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
-! store the product in a second limb vector.
+/* SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
+ *                         store the product in a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1995, 1998,
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul2.S b/mpi/sparc32v8/mpih-mul2.S
index 9055f89e..55f37814 100644
--- a/mpi/sparc32v8/mpih-mul2.S
+++ b/mpi/sparc32v8/mpih-mul2.S
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
-! add the result to a second limb vector.
+/* SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
+ *                            add the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1993, 1994, 1995, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul3.S b/mpi/sparc32v8/mpih-mul3.S
index efd83de4..cfd0a157 100644
--- a/mpi/sparc32v8/mpih-mul3.S
+++ b/mpi/sparc32v8/mpih-mul3.S
@@ -1,26 +1,35 @@
-! SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
-! subtract the result from a second limb vector.
-
-! Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
-
+/* SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
+ *                            subtract the result from a second limb vector.
+ *
+ *      Copyright (C) 1992, 1993, 1994, 1998, 
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
+        
 ! INPUT PARAMETERS
 ! res_ptr	o0
 ! s1_ptr	o1
diff --git a/mpi/supersparc/udiv.S b/mpi/supersparc/udiv.S
index 07d904c7..31b7387c 100644
--- a/mpi/supersparc/udiv.S
+++ b/mpi/supersparc/udiv.S
@@ -1,25 +1,35 @@
-! SuperSPARC __udiv_qrnnd division support, used from longlong.h.
-! This is for SuperSPARC only, to compensate for its semi-functional
-! udiv instruction.
+/* SuperSPARC __udiv_qrnnd division support, used from longlong.h.
+ *            This is for SuperSPARC only, to compensate for its
+ *            semi-functional udiv instruction.
+ *
+ *      Copyright (C) 1993, 1994, 1996, 1998,
+ *                    2001 Free Software Foundation, Inc.
+ *       
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *	 Actually it's the same code with only minor changes in the
+ *	 way the data is stored; this is to support the abstraction
+ *	 of an optional secure memory allocation which may be used
+ *	 to avoid revealing of sensitive data due to paging etc.
+ *	 The GNU MP Library itself is published under the LGPL;
+ *	 however I decided to publish this code under the plain GPL.
+ */
 
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP 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 Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
 
 
 ! INPUT PARAMETERS