See ChangeLog: Tue Mar 14 18:54:19 CET 2000 Werner Koch

11 files changed, 68 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 0adabc492..1d0bbfce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-14 12:07:54  Werner Koch  ([email protected])
+
+	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add support for
+	DJGPP.
+	(GNUPG_CHECK_MLOCK): Check whether mlock sits in librt.
+	* configure.in: Add a test for unisgned long long.
+
 Tue Mar  7 18:45:31 CET 2000  Werner Koch  <[email protected]>
 
 	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Add NetBSD. By Thomas Klausner.
diff --git a/THANKS b/THANKS
index c5f8d6d3b..087be4380 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Enzo Michelangeli	   [email protected]
 Ernst Molitor		   [email protected]
 Fabio Coatti		   [email protected]
 Felix von Leitner	   [email protected]
+Frank Donahoe		   [email protected]
 Frank Heckenbach	   [email protected]
 Frank Stajano		   [email protected]
 Ga�l Qu�ri		   [email protected]
diff --git a/TODO b/TODO
index 9b7f765ac..72cc36438 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,10 @@
 
-  * don't allow certain commands in the edit menu when the secret key is
-    selected.
-
-  * --delete-secret-key should work even when the public key is not there.
-
   * Print the reason for revocation at certain places.
 
   * at least an option to prefer DSA keys over RSA when selecting the key to
     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
diff --git a/acinclude.m4 b/acinclude.m4
index 903b45e29..2b3aa587a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -312,11 +312,13 @@ define(GNUPG_CHECK_IPC,
 ######################################################################
 # Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock
 # is not called from uid 0 (not tested whether uid 0 works)
+# For DECs Tru64 we have also to check whether mlock is in librt
 ######################################################################
 dnl GNUPG_CHECK_MLOCK
 dnl
 define(GNUPG_CHECK_MLOCK,
   [ AC_CHECK_FUNCS(mlock)
+    AC_CHECK_LIB(rt, mlock)
     if test "$ac_cv_func_mlock" = "yes"; then
         AC_MSG_CHECKING(whether mlock is broken)
           AC_CACHE_VAL(gnupg_cv_have_broken_mlock,
@@ -580,7 +582,7 @@ AC_CHECK_TOOL(AS, as, false)
 AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
 [tmp_do_check="no"
 case "${target}" in
-    i386-emx-os2 | i[3456]86-pc-os2*emx )
+    i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
         ac_cv_sys_symbol_underscore=yes
         ;;
     *)
diff --git a/configure.in b/configure.in
index c0178000b..a19697c72 100644
--- a/configure.in
+++ b/configure.in
@@ -386,6 +386,7 @@ GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
+AC_CHECK_SIZEOF(unsigned long long, 0)
 
 if test "$ac_cv_sizeof_unsigned_short" = "0" \
    || test "$ac_cv_sizeof_unsigned_int" = "0" \
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c8d90540f..56e8f7007 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14 13:49:38  Werner Koch  ([email protected])
+
+	* keygen.c (keyedit_menu): Do not allow to use certain commands
+	while the secret key is selected.
+
 2000-03-09 12:53:09  Werner Koch  ([email protected])
 
 	* keygen.c (ask_expire_interval): Movede parsig to ...
diff --git a/g10/keyedit.c b/g10/keyedit.c
index d2f91c421..2beae7891 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -573,41 +573,42 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
     static struct { const char *name;
 		    enum cmdids id;
 		    int need_sk;
+		    int not_with_sk;
 		    int signmode;
 		    const char *desc;
 		  } cmds[] = {
-	{ N_("quit")    , cmdQUIT      , 0,1, N_("quit this menu") },
-	{ N_("q")       , cmdQUIT      , 0,1, NULL   },
-	{ N_("save")    , cmdSAVE      , 0,1, N_("save and quit") },
-	{ N_("help")    , cmdHELP      , 0,1, N_("show this help") },
-	{    "?"        , cmdHELP      , 0,1, NULL   },
-	{ N_("fpr")     , cmdFPR       , 0,1, N_("show fingerprint") },
-	{ N_("list")    , cmdLIST      , 0,1, N_("list key and user IDs") },
-	{ N_("l")       , cmdLIST      , 0,1, NULL   },
-	{ N_("uid")     , cmdSELUID    , 0,1, N_("select user ID N") },
-	{ N_("key")     , cmdSELKEY    , 0,0, N_("select secondary key N") },
-	{ N_("check")   , cmdCHECK     , 0,1, N_("list signatures") },
-	{ N_("c")       , cmdCHECK     , 0,1, NULL },
-	{ N_("sign")    , cmdSIGN      , 0,1, N_("sign the key") },
-	{ N_("s")       , cmdSIGN      , 0,1, NULL },
-	{ N_("lsign")   , cmdLSIGN     , 0,1, N_("sign the key locally") },
-	{ N_("debug")   , cmdDEBUG     , 0,0, NULL },
-	{ N_("adduid")  , cmdADDUID    , 1,0, N_("add a user ID") },
-	{ N_("deluid")  , cmdDELUID    , 0,0, N_("delete user ID") },
-	{ N_("addkey")  , cmdADDKEY    , 1,0, N_("add a secondary key") },
-	{ N_("delkey")  , cmdDELKEY    , 0,0, N_("delete a secondary key") },
-	{ N_("delsig")  , cmdDELSIG    , 0,0, N_("delete signatures") },
-	{ N_("expire")  , cmdEXPIRE    , 1,0, N_("change the expire date") },
-	{ N_("toggle")  , cmdTOGGLE    , 1,0, N_("toggle between secret "
-						 "and public key listing") },
-	{ N_("t"     )  , cmdTOGGLE    , 1,0, NULL },
-	{ N_("pref")    , cmdPREF      , 0,0,  N_("list preferences") },
-	{ N_("passwd")  , cmdPASSWD    , 1,0, N_("change the passphrase") },
-	{ N_("trust")   , cmdTRUST     , 0,0,  N_("change the ownertrust") },
-	{ N_("revsig")  , cmdREVSIG    , 0,0, N_("revoke signatures") },
-	{ N_("revkey")  , cmdREVKEY    , 1,0, N_("revoke a secondary key") },
-	{ N_("disable") , cmdDISABLEKEY, 0,0, N_("disable a key") },
-	{ N_("enable")  , cmdENABLEKEY , 0,0, N_("enable a key") },
+	{ N_("quit")    , cmdQUIT      , 0,0,1, N_("quit this menu") },
+	{ N_("q")       , cmdQUIT      , 0,0,1, NULL   },
+	{ N_("save")    , cmdSAVE      , 0,0,1, N_("save and quit") },
+	{ N_("help")    , cmdHELP      , 0,0,1, N_("show this help") },
+	{    "?"        , cmdHELP      , 0,0,1, NULL   },
+	{ N_("fpr")     , cmdFPR       , 0,0,1, N_("show fingerprint") },
+	{ N_("list")    , cmdLIST      , 0,0,1, N_("list key and user IDs") },
+	{ N_("l")       , cmdLIST      , 0,0,1, NULL   },
+	{ N_("uid")     , cmdSELUID    , 0,0,1, N_("select user ID N") },
+	{ N_("key")     , cmdSELKEY    , 0,0,0, N_("select secondary key N") },
+	{ N_("check")   , cmdCHECK     , 0,0,1, N_("list signatures") },
+	{ N_("c")       , cmdCHECK     , 0,0,1, NULL },
+	{ N_("sign")    , cmdSIGN      , 0,1,1, N_("sign the key") },
+	{ N_("s")       , cmdSIGN      , 0,1,1, NULL },
+	{ N_("lsign")   , cmdLSIGN     , 0,1,1, N_("sign the key locally") },
+	{ N_("debug")   , cmdDEBUG     , 0,1,0, NULL },
+	{ N_("adduid")  , cmdADDUID    , 1,1,0, N_("add a user ID") },
+	{ N_("deluid")  , cmdDELUID    , 0,1,0, N_("delete user ID") },
+	{ N_("addkey")  , cmdADDKEY    , 1,1,0, N_("add a secondary key") },
+	{ N_("delkey")  , cmdDELKEY    , 0,1,0, N_("delete a secondary key") },
+	{ N_("delsig")  , cmdDELSIG    , 0,1,0, N_("delete signatures") },
+	{ N_("expire")  , cmdEXPIRE    , 1,1,0, N_("change the expire date") },
+	{ N_("toggle")  , cmdTOGGLE    , 1,0,0, N_("toggle between secret "
+						   "and public key listing") },
+	{ N_("t"     )  , cmdTOGGLE    , 1,0,0, NULL },
+	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences") },
+	{ N_("passwd")  , cmdPASSWD    , 1,1,0, N_("change the passphrase") },
+	{ N_("trust")   , cmdTRUST     , 0,1,0, N_("change the ownertrust") },
+	{ N_("revsig")  , cmdREVSIG    , 0,1,0, N_("revoke signatures") },
+	{ N_("revkey")  , cmdREVKEY    , 1,1,0, N_("revoke a secondary key") },
+	{ N_("disable") , cmdDISABLEKEY, 0,1,0, N_("disable a key") },
+	{ N_("enable")  , cmdENABLEKEY , 0,1,0, N_("enable a key") },
 
     { NULL, cmdNONE } };
     enum cmdids cmd = 0;
@@ -726,6 +727,10 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 		tty_printf(_("Need the secret key to do this.\n"));
 		cmd = cmdNOP;
 	    }
+	    else if( cmds[i].not_with_sk && sec_keyblock && toggle ) {
+		tty_printf(_("Please use the command \"toggle\" first.\n"));
+		cmd = cmdNOP;
+	    }
 	    else
 		cmd = cmds[i].id;
 	}
diff --git a/include/ChangeLog b/include/ChangeLog
index 464704e18..aa6971a2b 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-14 14:03:43  Werner Koch  ([email protected])
+
+	* types.h (HAVE_U64_TYPEDEF): Defined depending on configure test.
+
 Thu Jan 13 19:31:58 CET 2000  Werner Koch  <[email protected]>
 
 	* types.h (HAVE_U64_TYPEDEF): Add a test for _LONGLONG which fixes
diff --git a/include/types.h b/include/types.h
index bf98840b2..a91e89a50 100644
--- a/include/types.h
+++ b/include/types.h
@@ -96,7 +96,7 @@
   #elif SIZEOF_UNSIGNED_LONG == 8
     typedef unsigned long u64;
     #define HAVE_U64_TYPEDEF
-  #elif __GNUC__ >= 2 || defined(__SUNPRO_C) || defined(_LONGLONG)
+  #elif SIZEOF_UNSIGNED_LONG_LONG == 8
     typedef unsigned long long u64;
     #define HAVE_U64_TYPEDEF
   #endif
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 393eda8c1..e199f316d 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14 12:03:56  Werner Koch  ([email protected])
+
+	* Makefile.am: Do not use .s and .S files but a temp names, so that
+	OSes with caseinsensitive filenames do work.  From Frank Donahoe.
+
 Tue Mar  7 18:45:31 CET 2000  Werner Koch  <[email protected]>
 
 	* mpih-mul.c (mpihelp_mul_karatsuba_case): It seems that the
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index d12e89310..cdc39ee76 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = config.links
 DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
 		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
 # Note: we only use .S files so we should delete all left over .s
-CLEANFILES = *.s
+CLEANFILES = _*.s
 
 noinst_LIBRARIES = libmpi.a
 
@@ -51,10 +51,10 @@ libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
 # cancel the default rules used by libtool which do not really
 # work and add one to cpp .S files
 .S.o:
+	 $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
+	 $(COMPILE) -c _$*.s
+	 mv -f _$*.o $*.o
 
 .S.lo:
 
-.S.s:
-	 $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >$*.s
-