gnupg/g10 (ChangeLog apdu.c g10.c keylist.c trustdb.c)

[cvs user dshaw]

    Date: Wednesday, December 15, 2004 @ 06:16:53
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog apdu.c g10.c keylist.c trustdb.c

* apdu.c (apdu_send_le, apdu_send_direct), keylist.c
(status_one_subpacket, print_one_subpacket): Fix some compiler warnings.

* g10.c (main): Fix --compression-algo to take a string argument like
--compress-algo.

* trustdb.c (uid_trust_string_fixed): For safety, check for a pk.


-----------+
 ChangeLog |   11 +++++++++++
 apdu.c    |   14 +++++++++-----
 g10.c     |    2 +-
 keylist.c |    4 ++--
 trustdb.c |    4 ++--
 5 files changed, 25 insertions(+), 10 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.658 gnupg/g10/ChangeLog:1.659
--- gnupg/g10/ChangeLog:1.658	Tue Dec 14 15:50:15 2004
+++ gnupg/g10/ChangeLog	Wed Dec 15 06:16:53 2004
@@ -1,3 +1,14 @@
+2004-12-15  David Shaw  <dshaw at jabberwocky.com>
+
+	* apdu.c (apdu_send_le, apdu_send_direct), keylist.c
+	(status_one_subpacket, print_one_subpacket): Fix some compiler
+	warnings.
+
+	* g10.c (main): Fix --compression-algo to take a string argument
+	like --compress-algo.
+
+	* trustdb.c (uid_trust_string_fixed): For safety, check for a pk.
+
 2004-12-14  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyedit.c (keyedit_menu): Re-remove the N_() markers.
Index: gnupg/g10/apdu.c
diff -u gnupg/g10/apdu.c:1.17 gnupg/g10/apdu.c:1.18
--- gnupg/g10/apdu.c:1.17	Thu Oct 28 11:06:50 2004
+++ gnupg/g10/apdu.c	Wed Dec 15 06:16:53 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: apdu.c,v 1.17 2004/10/28 09:06:50 wk Exp $
+ * $Id: apdu.c,v 1.18 2004/12/15 05:16:53 dshaw Exp $
  */
 
 #include <config.h>
@@ -2717,7 +2717,8 @@
   resultlen -= 2;
   if (DBG_CARD_IO)
     {
-      log_debug (" response: sw=%04X  datalen=%d\n", sw, resultlen);
+      log_debug (" response: sw=%04X  datalen=%u\n",
+		 sw, (unsigned int)resultlen);
       if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
         log_printhex ("     dump: ", result, resultlen);
     }
@@ -2783,7 +2784,8 @@
           resultlen -= 2;
           if (DBG_CARD_IO)
             {
-              log_debug ("     more: sw=%04X  datalen=%d\n", sw, resultlen);
+              log_debug ("     more: sw=%04X  datalen=%u\n",
+			 sw, (unsigned int)resultlen);
               if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
                 log_printhex ("     dump: ", result, resultlen);
             }
@@ -2916,7 +2918,8 @@
   resultlen -= 2;
   if (DBG_CARD_IO)
     {
-      log_debug (" response: sw=%04X  datalen=%d\n", sw, resultlen);
+      log_debug (" response: sw=%04X  datalen=%u\n",
+		 sw, (unsigned int)resultlen);
       if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
         log_printhex ("     dump: ", result, resultlen);
     }
@@ -2968,7 +2971,8 @@
           resultlen -= 2;
           if (DBG_CARD_IO)
             {
-              log_debug ("     more: sw=%04X  datalen=%d\n", sw, resultlen);
+              log_debug ("     more: sw=%04X  datalen=%u\n",
+			 sw, (unsigned int)resultlen);
               if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
                 log_printhex ("     dump: ", result, resultlen);
             }
Index: gnupg/g10/g10.c
diff -u gnupg/g10/g10.c:1.292 gnupg/g10/g10.c:1.293
--- gnupg/g10/g10.c:1.292	Sat Dec 11 05:47:33 2004
+++ gnupg/g10/g10.c	Wed Dec 15 06:16:53 2004
@@ -517,6 +517,7 @@
     { oDigestAlgo, "digest-algo", 2, "@"},
     { oCertDigestAlgo, "cert-digest-algo", 2 , "@" },
     { oCompressAlgo,"compress-algo", 2, "@"},
+    { oCompressAlgo, "compression-algo", 2, "@"}, /* Alias */
     { oThrowKeyids, "throw-keyid", 0, "@"},
     { oThrowKeyids, "throw-keyids", 0, "@"},
     { oNoThrowKeyids, "no-throw-keyid", 0, "@" },
@@ -542,7 +543,6 @@
 
   /* hidden options */
     { aListOwnerTrust, "list-ownertrust", 256, "@"}, /* deprecated */
-    { oCompressAlgo, "compression-algo", 1, "@"}, /* alias */
     { aPrintMDs, "print-mds" , 256, "@"}, /* old */
     { aListTrustDB, "list-trustdb",0 , "@"},
     /* Not yet used */
Index: gnupg/g10/keylist.c
diff -u gnupg/g10/keylist.c:1.90 gnupg/g10/keylist.c:1.91
--- gnupg/g10/keylist.c:1.90	Wed Nov 24 06:25:03 2004
+++ gnupg/g10/keylist.c	Wed Dec 15 06:16:53 2004
@@ -168,7 +168,7 @@
   if(len>256)
     return;
 
-  sprintf(status,"%d %u %u ",type,flags,len);
+  sprintf(status,"%d %u %u ",type,flags,(unsigned int)len);
 
   write_status_text_and_buffer(STATUS_SIG_SUBPACKET,status,buf,len,0);
 }
@@ -580,7 +580,7 @@
 {
   size_t i;
 
-  printf("spk:%d:%u:%u:",type,flags,len);
+  printf("spk:%d:%u:%u:",type,flags,(unsigned int)len);
 
   for(i=0;i<len;i++)
     {
Index: gnupg/g10/trustdb.c
diff -u gnupg/g10/trustdb.c:1.135 gnupg/g10/trustdb.c:1.136
--- gnupg/g10/trustdb.c:1.135	Tue Dec 14 15:42:41 2004
+++ gnupg/g10/trustdb.c	Wed Dec 15 06:16:53 2004
@@ -502,11 +502,11 @@
 {
   if(!key && !uid)
     return _("10 translator see trustdb.c:uid_trust_string_fixed");
-  else if(uid->is_revoked || key->is_revoked)
+  else if(uid->is_revoked || (key && key->is_revoked))
     return                         _("[ revoked]");
   else if(uid->is_expired)
     return                         _("[ expired]");
-  else
+  else if(key)
     switch(get_validity(key,uid)&TRUST_MASK)
       {
       case TRUST_UNKNOWN:   return _("[ unknown]");