security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Fix minor compiler warnings.

Browse Source 
--
This commit is contained in:
Werner Koch 2013-11-15 09:23:40 +01:00
parent 402aa0f948
commit a0102a548d
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/build-packet.c
View File

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

1
g10/kbnode.c
View File

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

2
g10/parse-packet.c
View File

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

2
tests/openpgp/ecc.test
View File

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

8
tests/openpgp/import.test
View File

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