Fix minor compiler warnings.

--

g10/build-packet.c

@@ -331,7 +331,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
   for (i=0; i < npkey; i++ )
     {
       if ((pk->pubkey_algo == PUBKEY_ALGO_ECDSA && (i == 0))
-          || (pk->pubkey_algo == PUBKEY_ALGO_ECDH) && (i == 0 || i == 2))
+          || ((pk->pubkey_algo == PUBKEY_ALGO_ECDH) && (i == 0 || i == 2)))
         err = gpg_mpi_write_nohdr (a, pk->pkey[i]);
       else
         err = gpg_mpi_write (a, pk->pkey[i]);

g10/kbnode.c

@@ -26,6 +26,7 @@
 
 #include "gpg.h"
 #include "util.h"
+#include "../common/init.h"
 #include "packet.h"
 #include "keydb.h"
 

g10/parse-packet.c

@@ -1991,7 +1991,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
       for (i = 0; i < npkey; i++)
         {
           if ((algorithm == PUBKEY_ALGO_ECDSA && (i == 0))
-              || (algorithm == PUBKEY_ALGO_ECDH) && (i == 0 || i == 2))
+              || ((algorithm == PUBKEY_ALGO_ECDH) && (i == 0 || i == 2)))
             {
               size_t n;
 	      err = read_size_body (inp, pktlen, &n, pk->pkey+i);

tests/openpgp/ecc.test

@@ -20,7 +20,7 @@ mainkeyids='BAA59D9C
             45AF2FFE'
 
 
-if have_pubkey_algo "ECDH"; then
+if have_pubkey_algo "ECC"; then
   :
 else
   info "No ECC support due to an old Libgcrypt"

tests/openpgp/import.test

@@ -31,11 +31,3 @@ if $GPG --list-keys --with-colons $keyid \
 else
   error "$goodkey: import failed (bug 1223)"
 fi
-
-
-
-
-
-
-
-