* 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.

1 files changed, 1 insertions, 1 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 2a17214d9..021c50b8a 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -517,6 +517,7 @@ static ARGPARSE_OPTS opts[] = {
     { 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 @@ static ARGPARSE_OPTS opts[] = {
 
   /* hidden options */
     { aListOwnerTrust, "list-ownertrust", 256, "@"}, /* deprecated */
-    { oCompressAlgo, "compression-algo", 1, "@"}, /* alias */
     { aPrintMDs, "print-mds" , 256, "@"}, /* old */
     { aListTrustDB, "list-trustdb",0 , "@"},
     /* Not yet used */