See ChangeLog: Tue Mar 7 18:45:31 CET 2000 Werner Koch

12 files changed, 58 insertions, 11 deletions

diff --git a/AUTHORS b/AUTHORS
index 7dfa80b29..d000755f1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,9 +11,9 @@ Gael Queri  <[email protected]>  Translations [fr]
 
 Gregory Steuck <[email protected]> Translations [ru]
 
-Edmund GRIMLEY EVANS <[email protected]> ?????? [eo]
+Edmund GRIMLEY EVANS <[email protected]> Translations [eo]
 
-Ivo Timmermans <[email protected]> ?????? [nl]
+Ivo Timmermans <[email protected]> Translations [nl]
 
 Janusz Aleksander Urbanowicz <[email protected]> Translations [po]
 
@@ -45,7 +45,7 @@ Walter Koch <[email protected]>  Translations [de]
 Werner Koch  <[email protected]>  Assignment
     (started the whole thing)
 
-Yosiaki IIDA <[email protected]> xxxx [ja]
+Yosiaki IIDA <[email protected]> Translations [ja]
 
 
 
diff --git a/ChangeLog b/ChangeLog
index a5dcb4075..0adabc492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  7 18:45:31 CET 2000  Werner Koch  <[email protected]>
+
+	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Add NetBSD. By Thomas Klausner.
+	* configure.in (DYNLINK_MOD_CFLAGS): Set different for NetBSD.
+
 Thu Mar  2 15:37:46 CET 2000  Werner Koch  <[email protected]>
 
 	* configure.in: Add check for clock_gettime
diff --git a/THANKS b/THANKS
index 7920f3c57..c5f8d6d3b 100644
--- a/THANKS
+++ b/THANKS
@@ -97,6 +97,7 @@ Roddy Strachan		   [email protected]
 Roland Rosenfeld	   [email protected]
 Ross Golder		   [email protected]
 Sam Roberts		   [email protected]
+Sean MacLennan		   [email protected]
 Serge Munhoven		   [email protected]
 SL Baur 		   [email protected]
 Stefan Karrmann 	   [email protected]
@@ -110,6 +111,7 @@ Thomas Roessler 	   [email protected]
 Tom Spindler		   [email protected]
 Tom Zerucha		   [email protected]
 Tomas Fasth		   [email protected]
+Thomas Klausner 	   [email protected]
 Thomas Mikkelsen	   [email protected]
 Ulf M�ller		   [email protected]
 Urko Lusa		   [email protected]
diff --git a/TODO b/TODO
index 23a23783d..9b7f765ac 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,8 @@
     use.  Depending on creatin time would be nice too.	I thing this is
     already done for the subkeys.
 
+  * write a M4 for the unsigned long long type.
+
 Scheduled for 1.1
 -----------------
   * With option -i prompt before adding a key to the keyring and show some
@@ -65,5 +67,4 @@ Nice to have
     trustdb.
   * Evaluate whether it make sense to replace the namehashs either by
     using the user ID directly or by using pointers into the trustdb.
-  * --gen-prime may trigger a log_bug; should be a log_fatal.
 
diff --git a/acinclude.m4 b/acinclude.m4
index f0638a5be..903b45e29 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -226,7 +226,7 @@ define(GNUPG_CHECK_RDYNAMIC,
             CFLAGS_RDYNAMIC="-Wl,-E"
             ;;
 
-          openbsd* | freebsd2* | osf4* | irix* )
+          openbsd* | freebsd2* | osf4* | irix* | netbsd* )
             CFLAGS_RDYNAMIC=""
             ;;
 
diff --git a/configure.in b/configure.in
index 1d14d3b3e..c0178000b 100644
--- a/configure.in
+++ b/configure.in
@@ -252,13 +252,19 @@ esac
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")
 
 dnl  Fixme: Are these the best flags for OpenBSD????
-dnl (I have removed the -lc from * ...CFLAGS for test purposes.)
 case "${target}" in
     *-openbsd*)
         NAME_OF_DEV_RANDOM="/dev/srandom"
         NAME_OF_DEV_URANDOM="/dev/urandom"
         DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
         ;;
+
+    *-netbsd*)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+        ;;
+
     *)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 7ef20de40..393eda8c1 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar  7 18:45:31 CET 2000  Werner Koch  <[email protected]>
+
+	* mpih-mul.c (mpihelp_mul_karatsuba_case): It seems that the
+	untested part works fine.  Removed the debugging message.
+
+	* longlong.h (umul_ppmm): Fixes for ARM-4. By Sean MacLennan.
+
+	* config.links: Add support for NetBSD.
+
 Thu Jan 13 19:31:58 CET 2000  Werner Koch  <[email protected]>
 
 	* mpi-internal.h (karatsuba_ctx): New.
diff --git a/mpi/config.links b/mpi/config.links
index 73bed01bb..96cfeba29 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -1,4 +1,4 @@
-# sourced my ../configure to get the list of files to link
+# sourced by ../configure to get the list of files to link
 # this should set $mpi_ln_src and mpi_ln_dst.
 # Note: this is called from the above directory.
 
@@ -12,12 +12,14 @@ echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h
 
 if test "$try_asm_modules" = "yes" ; then
 case "${target}" in
-    i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd[34]* | i[34]86*-*-freebsdelf*)
+    i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd[34]* | i[34]86*-*-freebsdelf* \
+      | i[34]86*-*-netbsd* )
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]* | i[56]86*-*-freebsdelf*)
+    i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]* | i[56]86*-*-freebsdelf* \
+      | i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i586 i386"
diff --git a/mpi/longlong.h b/mpi/longlong.h
index c92435570..e36beae49 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -199,6 +199,8 @@ extern UDItype __udiv_qrnnd ();
 	     "rI" ((USItype)(bh)),                                      \
 	     "r" ((USItype)(al)),                                       \
 	     "rI" ((USItype)(bl)))
+#ifdef __ARM_ARCH_3__
+/* SAM This does not work on arm4 */
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
 	mov	%|r0, %2, lsr #16
@@ -218,6 +220,18 @@ extern UDItype __udiv_qrnnd ();
 	   : "r" ((USItype)(a)),                                        \
 	     "r" ((USItype)(b))                                         \
 	   : "r0", "r1", "r2")
+#elif __ARM_ARCH_4__
+#define umul_ppmm(xh, xl, a, b) \
+  __asm__ ("%@ Inlined umul_ppmm
+	umull	%r1, %r0, %r2, %r3" \
+		   : "=&r" ((USItype)(xh)), \
+		     "=r" ((USItype)(xl)) \
+		   : "r" ((USItype)(a)), \
+		     "r" ((USItype)(b)) \
+		   : "r0", "r1")
+#else
+#error Untested architecture
+#endif
 #define UMUL_TIME 20
 #define UDIV_TIME 100
 #endif /* __arm__ */
diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c
index 3422f6541..e1bfef55b 100644
--- a/mpi/mpih-mul.c
+++ b/mpi/mpih-mul.c
@@ -415,8 +415,6 @@ mpihelp_mul_karatsuba_case( mpi_ptr_t prodp,
     }
 
     if( usize ) {
-       #warning  Must test this CODE!!!
-	g10_log_debug("this code path is not yet tested\n");
 	if( usize < KARATSUBA_THRESHOLD ) {
 	    mpihelp_mul( ctx->tspace, vp, vsize, up, usize );
 	}
diff --git a/util/ChangeLog b/util/ChangeLog
index e8585ac27..4fdc43f7e 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar  7 18:45:31 CET 2000  Werner Koch  <[email protected]>
+
+	* secmem.c (lock_pool): No more warning for QNX. By Sam Roberts.
+
 2000-03-02 15:51:04  Werner Koch  ([email protected])
 
 	* ttyio.c (tty_print_utf8_string): Oops.
diff --git a/util/secmem.c b/util/secmem.c
index 0ab218567..54836cbcf 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -145,6 +145,12 @@ lock_pool( void *p, size_t n )
 	show_warning = 1;
     }
 
+  #elif defined ( __QNX__ )
+    /* QNX does not page at all, so the whole secure memory stuff does
+     * not make much sense.  However it is still of use because it
+     * wipes out the memory on a free().
+     * Therefore it is sufficient to suppress the warning
+     */
   #else
     log_info("Please note that you don't have secure memory on this system\n");
   #endif