diff options
author | Werner Koch <[email protected]> | 2013-11-15 08:23:40 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2013-11-15 14:49:34 +0000 |
commit | a0102a548d0e2ed2fce74ba4a21adf26bc352641 (patch) | |
tree | c41e31e39f8c57fecc6dedeafb35b59a541d80d8 /g10 | |
parent | gpg: Rework ECC support and add experimental support for Ed25519. (diff) | |
download | gnupg-a0102a548d0e2ed2fce74ba4a21adf26bc352641.tar.gz gnupg-a0102a548d0e2ed2fce74ba4a21adf26bc352641.zip |
Fix minor compiler warnings.
--
Diffstat (limited to 'g10')
-rw-r--r-- | g10/build-packet.c | 2 | ||||
-rw-r--r-- | g10/kbnode.c | 1 | ||||
-rw-r--r-- | g10/parse-packet.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index 6681b3429..b4514aebb 100644 --- a/g10/build-packet.c +++ b/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]); diff --git a/g10/kbnode.c b/g10/kbnode.c index d4907408b..ad66f8a99 100644 --- a/g10/kbnode.c +++ b/g10/kbnode.c @@ -26,6 +26,7 @@ #include "gpg.h" #include "util.h" +#include "../common/init.h" #include "packet.h" #include "keydb.h" diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 3b2698fcb..f4390c38a 100644 --- a/g10/parse-packet.c +++ b/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); |