security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Removed some set but unused variables.

Browse Source
This commit is contained in:
Werner Koch 2011-08-04 12:22:04 +02:00
parent 60d8c901ce
commit e306c18624
25 changed files with 811 additions and 788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2011-08-04 Werner Koch <wk@g10code.com> 2011-08-04 Werner Koch <wk@g10code.com>
* configure.ac: Fix usage of AC_LANG_PROGRAM. * configure.ac: Fix usage of AC_LANG_PROGRAM.
(AC_CHECK_HEADERS): Check for utmp.h.
2011-02-04 Werner Koch <wk@g10code.com> 2011-02-04 Werner Koch <wk@g10code.com>

9
agent/ChangeLog
View File

@ -1,3 +1,12 @@
2011-08-04 Werner Koch <wk@g10code.com>
* genkey.c (check_passphrase_pattern): Use gpg_strerror.
* command-ssh.c (ssh_receive_mpint_list): Remove set but unused
var ELEMS_PUBLIC_N.
* gpg-agent.c (main): Remove set but unused var MAY_COREDUMP.
2011-07-22 Werner Koch <wk@g10code.com> 2011-07-22 Werner Koch <wk@g10code.com>
* command-ssh.c (ssh_receive_key): Do not init comment to an empty * command-ssh.c (ssh_receive_key): Do not init comment to an empty

2
agent/command-ssh.c
View File

@ -875,7 +875,6 @@ static gpg_error_t
ssh_receive_mpint_list (estream_t stream, int secret, ssh_receive_mpint_list (estream_t stream, int secret,
ssh_key_type_spec_t key_spec, gcry_mpi_t **mpi_list) ssh_key_type_spec_t key_spec, gcry_mpi_t **mpi_list)
{ {
unsigned int elems_public_n;
const char *elems_public; const char *elems_public;
unsigned int elems_n; unsigned int elems_n;
const char *elems; const char *elems;
@ -894,7 +893,6 @@ ssh_receive_mpint_list (estream_t stream, int secret,
elems_n = strlen (elems); elems_n = strlen (elems);
elems_public = key_spec.elems_key_public; elems_public = key_spec.elems_key_public;
elems_public_n = strlen (elems_public);
mpis = xtrycalloc (elems_n + 1, sizeof *mpis ); mpis = xtrycalloc (elems_n + 1, sizeof *mpis );
if (!mpis) if (!mpis)

4
agent/genkey.c
View File

@ -105,7 +105,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
if (!infp) if (!infp)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
log_error (_("error creating temporary file: %s\n"), strerror (errno)); log_error (_("error creating temporary file: %s\n"), gpg_strerror (err));
return 1; /* Error - assume password should not be used. */ return 1; /* Error - assume password should not be used. */
} }
@ -113,7 +113,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
log_error (_("error writing to temporary file: %s\n"), log_error (_("error writing to temporary file: %s\n"),
strerror (errno)); gpg_strerror (err));
fclose (infp); fclose (infp);
return 1; /* Error - assume password should not be used. */ return 1; /* Error - assume password should not be used. */
} }

3
agent/gpg-agent.c
View File

@ -550,7 +550,6 @@ main (int argc, char **argv )
{ {
ARGPARSE_ARGS pargs; ARGPARSE_ARGS pargs;
int orig_argc; int orig_argc;
int may_coredump;
char **orig_argv; char **orig_argv;
FILE *configfp = NULL; FILE *configfp = NULL;
char *configname = NULL; char *configname = NULL;
@ -624,7 +623,7 @@ main (int argc, char **argv )
setup_libgcrypt_logging (); setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
may_coredump = disable_core_dumps (); disable_core_dumps ();
/* Set default options. */ /* Set default options. */
parse_rereadable_options (NULL, 0); /* Reset them to default values. */ parse_rereadable_options (NULL, 0); /* Reset them to default values. */

7
common/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-04 Werner Koch <wk@g10code.com>
* pka.c (get_pka_info): Remove set but unused variables ARCOUNT
and NSCOUNT.
* estream.c (es_fwrite, es_fread): Remove set but unused variable
ERR.
2011-04-29 Werner Koch <wk@g10code.com> 2011-04-29 Werner Koch <wk@g10code.com>
* estream.c (es_pth_kill): New. * estream.c (es_pth_kill): New.

6
common/estream.c
View File

@ -2905,12 +2905,11 @@ es_fread (void *ES__RESTRICT ptr, size_t size, size_t nitems,
estream_t ES__RESTRICT stream) estream_t ES__RESTRICT stream)
{ {
size_t ret, bytes; size_t ret, bytes;
int err;
if (size * nitems) if (size * nitems)
{ {
ESTREAM_LOCK (stream); ESTREAM_LOCK (stream);
err = es_readn (stream, ptr, size * nitems, &bytes); es_readn (stream, ptr, size * nitems, &bytes);
ESTREAM_UNLOCK (stream); ESTREAM_UNLOCK (stream);
ret = bytes / size; ret = bytes / size;
@ -2927,12 +2926,11 @@ es_fwrite (const void *ES__RESTRICT ptr, size_t size, size_t nitems,
estream_t ES__RESTRICT stream) estream_t ES__RESTRICT stream)
{ {
size_t ret, bytes; size_t ret, bytes;
int err;
if (size * nitems) if (size * nitems)
{ {
ESTREAM_LOCK (stream); ESTREAM_LOCK (stream);
err = es_writen (stream, ptr, size * nitems, &bytes); es_writen (stream, ptr, size * nitems, &bytes);
ESTREAM_UNLOCK (stream); ESTREAM_UNLOCK (stream);
ret = bytes / size; ret = bytes / size;

4
common/pka.c
View File

@ -179,7 +179,7 @@ get_pka_info (const char *address, unsigned char *fpr)
HEADER h; HEADER h;
} answer; } answer;
int anslen; int anslen;
int qdcount, ancount, nscount, arcount; int qdcount, ancount;
int rc; int rc;
unsigned char *p, *pend; unsigned char *p, *pend;
const char *domain; const char *domain;
@ -210,8 +210,6 @@ get_pka_info (const char *address, unsigned char *fpr)
qdcount = ntohs (answer.h.qdcount); qdcount = ntohs (answer.h.qdcount);
ancount = ntohs (answer.h.ancount); ancount = ntohs (answer.h.ancount);
nscount = ntohs (answer.h.nscount);
arcount = ntohs (answer.h.arcount);
if (!ancount) if (!ancount)
return NULL; /* Got no answer. */ return NULL; /* Got no answer. */

2
configure.ac
View File

@ -1024,7 +1024,7 @@ fi
AC_MSG_NOTICE([checking for header files]) AC_MSG_NOTICE([checking for header files])
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h]) AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h])
AC_CHECK_HEADERS([pty.h pwd.h inttypes.h]) AC_CHECK_HEADERS([pty.h utmp.h pwd.h inttypes.h])
AC_HEADER_TIME AC_HEADER_TIME

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-04 Werner Koch <wk@g10code.com>
* keyedit.c (show_key_with_all_names): Remove set but unused var
PK_VERION.
* sig-check.c (do_check): Remove set but unused var CTX.
* build-packet.c (do_user_id): Return RC.
2011-07-29 Werner Koch <wk@g10code.com> 2011-07-29 Werner Koch <wk@g10code.com>
* tdbio.c (open_db): Do not print read-only warning in quiet mode. * tdbio.c (open_db): Do not print read-only warning in quiet mode.

2
g10/build-packet.c
View File

@ -239,7 +239,7 @@ do_user_id( IOBUF out, int ctb, PKT_user_id *uid )
write_header2( out, ctb, uid->len, 2 ); write_header2( out, ctb, uid->len, 2 );
rc = iobuf_write( out, uid->name, uid->len ); rc = iobuf_write( out, uid->name, uid->len );
} }
return 0; return rc;
} }
static int static int

2
g10/keyedit.c
View File

@ -2769,7 +2769,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
KBNODE node; KBNODE node;
int i; int i;
int do_warn = 0; int do_warn = 0;
byte pk_version=0;
PKT_public_key *primary=NULL; PKT_public_key *primary=NULL;
if (opt.with_colons) if (opt.with_colons)
@ -2801,7 +2800,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
do_warn = 1; do_warn = 1;
} }
pk_version=pk->version;
primary=pk; primary=pk;
} }

3
g10/sig-check.c
View File

@ -265,7 +265,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
{ {
gcry_mpi_t result = NULL; gcry_mpi_t result = NULL;
int rc = 0; int rc = 0;
struct cmp_help_context_s ctx;
if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) ) if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) )
return rc; return rc;
@ -318,8 +317,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
result = encode_md_value( pk, NULL, digest, sig->digest_algo ); result = encode_md_value( pk, NULL, digest, sig->digest_algo );
if (!result) if (!result)
return G10ERR_GENERAL; return G10ERR_GENERAL;
ctx.sig = sig;
ctx.md = digest;
rc = pk_verify( pk->pubkey_algo, result, sig->data, pk->pkey ); rc = pk_verify( pk->pubkey_algo, result, sig->data, pk->pkey );
gcry_mpi_release (result); gcry_mpi_release (result);

5
kbx/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-04 Werner Koch <wk@g10code.com>
* keybox-openpgp.c (parse_key): Remove set but unused vars
EXPIREDATE and NDAYS.
2010-07-23 Werner Koch <wk@g10code.com> 2010-07-23 Werner Koch <wk@g10code.com>
* keybox-blob.c (_keybox_create_x509_blob): Fix reallocation bug. * keybox-blob.c (_keybox_create_x509_blob): Fix reallocation bug.

13
kbx/keybox-openpgp.c
View File

@ -195,7 +195,7 @@ parse_key (const unsigned char *data, size_t datalen,
const unsigned char *data_start = data; const unsigned char *data_start = data;
int i, version, algorithm; int i, version, algorithm;
size_t n; size_t n;
unsigned long timestamp, expiredate; /*unsigned long timestamp;*/
int npkey; int npkey;
unsigned char hashbuffer[768]; unsigned char hashbuffer[768];
const unsigned char *mpi_n = NULL; const unsigned char *mpi_n = NULL;
@ -208,22 +208,15 @@ parse_key (const unsigned char *data, size_t datalen,
if (version < 2 || version > 4 ) if (version < 2 || version > 4 )
return gpg_error (GPG_ERR_INV_PACKET); /* Invalid version. */ return gpg_error (GPG_ERR_INV_PACKET); /* Invalid version. */
timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3])); /*timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));*/
data +=4; datalen -=4; data +=4; datalen -=4;
if (version < 4) if (version < 4)
{ {
unsigned short ndays;
if (datalen < 2) if (datalen < 2)
return gpg_error (GPG_ERR_INV_PACKET); return gpg_error (GPG_ERR_INV_PACKET);
ndays = ((data[0]<<8)|(data[1])); data += 2; datalen -= 2;
data +=2; datalen -= 2;
if (ndays)
expiredate = ndays? (timestamp + ndays * 86400L) : 0;
} }
else
expiredate = 0; /* This is stored in the self-signature. */
if (!datalen) if (!datalen)
return gpg_error (GPG_ERR_INV_PACKET); return gpg_error (GPG_ERR_INV_PACKET);

6
scd/ChangeLog
View File

@ -1,3 +1,9 @@
2011-08-04 Werner Koch <wk@g10code.com>
* pcsc-wrapper.c (handle_open): Remove unused var LISTLEN.
* scdaemon.c (main): Remove var MAY_COREDUMP.
2011-01-25 NIIBE Yutaka <gniibe@fsij.org>, 2011-01-25 NIIBE Yutaka <gniibe@fsij.org>,
Grant Olson <kgo@grant-olson.net> (wk) Grant Olson <kgo@grant-olson.net> (wk)

5
scd/apdu.c
View File

@ -1584,7 +1584,8 @@ open_pcsc_reader_wrapped (const char *portstr)
unsigned char msgbuf[9]; unsigned char msgbuf[9];
int err; int err;
unsigned int dummy_status; unsigned int dummy_status;
int sw = SW_HOST_CARD_IO_ERROR; /*int sw = SW_HOST_CARD_IO_ERROR;*/
/* Note that we use the constant and not the fucntion because this /* Note that we use the constant and not the fucntion because this
code won't be be used under Windows. */ code won't be be used under Windows. */
const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper"; const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
@ -1728,7 +1729,7 @@ open_pcsc_reader_wrapped (const char *portstr)
if (err) if (err)
{ {
log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err)); log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err));
sw = pcsc_error_to_sw (err); /*sw = pcsc_error_to_sw (err);*/
goto command_failed; goto command_failed;
} }

3
scd/pcsc-wrapper.c
View File

@ -384,7 +384,7 @@ handle_open (unsigned char *argbuf, size_t arglen)
long err; long err;
const char * portstr; const char * portstr;
char *list = NULL; char *list = NULL;
unsigned long nreader, listlen, atrlen; unsigned long nreader, atrlen;
char *p; char *p;
unsigned long card_state, card_protocol; unsigned long card_state, card_protocol;
unsigned char atr[33]; unsigned char atr[33];
@ -431,7 +431,6 @@ handle_open (unsigned char *argbuf, size_t arglen)
return; return;
} }
listlen = nreader;
p = list; p = list;
while (nreader) while (nreader)
{ {

3
scd/scdaemon.c
View File

@ -373,7 +373,6 @@ main (int argc, char **argv )
ARGPARSE_ARGS pargs; ARGPARSE_ARGS pargs;
int orig_argc; int orig_argc;
gpg_error_t err; gpg_error_t err;
int may_coredump;
char **orig_argv; char **orig_argv;
FILE *configfp = NULL; FILE *configfp = NULL;
char *configname = NULL; char *configname = NULL;
@ -440,7 +439,7 @@ main (int argc, char **argv )
setup_libgcrypt_logging (); setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
may_coredump = disable_core_dumps (); disable_core_dumps ();
/* Set default options. */ /* Set default options. */
opt.allow_admin = 1; opt.allow_admin = 1;

6
sm/ChangeLog
View File

@ -1,3 +1,9 @@
2011-08-04 Werner Koch <wk@g10code.com>
* keydb.c (keydb_add_resource): Remove set but unused var
CREATED_FNAME.
* gpgsm.c (main): Remove set but used var FNAME.
2011-07-21 Werner Koch <wk@g10code.com> 2011-07-21 Werner Koch <wk@g10code.com>
* call-dirmngr.c (get_cached_cert, get_cached_cert_data_cb): New. * call-dirmngr.c (get_cached_cert, get_cached_cert_data_cb): New.

3
sm/gpgsm.c
View File

@ -852,7 +852,6 @@ main ( int argc, char **argv)
ARGPARSE_ARGS pargs; ARGPARSE_ARGS pargs;
int orig_argc; int orig_argc;
char **orig_argv; char **orig_argv;
const char *fname;
/* char *username;*/ /* char *username;*/
int may_coredump; int may_coredump;
strlist_t sl, remusr= NULL, locusr=NULL; strlist_t sl, remusr= NULL, locusr=NULL;
@ -1623,8 +1622,6 @@ main ( int argc, char **argv)
if (log_get_errorcount(0)) if (log_get_errorcount(0))
gpgsm_exit(1); /* Must stop for invalid recipients. */ gpgsm_exit(1); /* Must stop for invalid recipients. */
fname = argc? *argv : NULL;
/* Dispatch command. */ /* Dispatch command. */
switch (cmd) switch (cmd)
{ {

2
sm/keydb.c
View File

@ -82,7 +82,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
int rc = 0; int rc = 0;
FILE *fp; FILE *fp;
KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE; KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
const char *created_fname = NULL;
if (auto_created) if (auto_created)
*auto_created = 0; *auto_created = 0;
@ -194,7 +193,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
if (!opt.quiet) if (!opt.quiet)
log_info (_("keybox `%s' created\n"), filename); log_info (_("keybox `%s' created\n"), filename);
created_fname = filename;
if (auto_created) if (auto_created)
*auto_created = 1; *auto_created = 1;
} }

7
tools/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-04 Werner Koch <wk@g10code.com>
* symcryptrun.c: Include utmp.h for login_tty.
* gpgconf-comp.c (gc_process_gpgconf_conf): Remove unsued var
USED_COMPONENTS.
2011-01-11 Werner Koch <wk@g10code.com> 2011-01-11 Werner Koch <wk@g10code.com>
* gpgtar.c, gpgtar.h, gpgtar-create.c, gpgtar-extract.c * gpgtar.c, gpgtar.h, gpgtar-create.c, gpgtar-extract.c

4
tools/gpgconf-comp.c
View File

@ -3333,7 +3333,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
int in_rule = 0; int in_rule = 0;
int got_match = 0; int got_match = 0;
int runtime[GC_BACKEND_NR]; int runtime[GC_BACKEND_NR];
int used_components[GC_COMPONENT_NR];
int backend_id, component_id; int backend_id, component_id;
char *fname; char *fname;
@ -3344,8 +3343,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++) for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
runtime[backend_id] = 0; runtime[backend_id] = 0;
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
used_components[component_id] = 0;
config = fopen (fname, "r"); config = fopen (fname, "r");
if (!config) if (!config)
@ -3573,7 +3570,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
if (defaults) if (defaults)
{ {
assert (component_id >= 0 && component_id < GC_COMPONENT_NR); assert (component_id >= 0 && component_id < GC_COMPONENT_NR);
used_components[component_id] = 1;
/* Here we explicitly allow to update the value again. */ /* Here we explicitly allow to update the value again. */
if (newflags) if (newflags)

9
tools/symcryptrun.c
View File

@ -72,14 +72,17 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#ifdef HAVE_PTY_H #ifdef HAVE_PTY_H
#include <pty.h> # include <pty.h>
#endif
#ifdef HAVE_UTMP_H
# include <utmp.h>
#endif #endif
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> # include <locale.h>
#endif #endif
#ifdef HAVE_LANGINFO_CODESET #ifdef HAVE_LANGINFO_CODESET
#include <langinfo.h> # include <langinfo.h>
#endif #endif
#include <gpg-error.h> #include <gpg-error.h>