security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-20 20:47:58 +02:00
Code Activity

* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c (struct

Browse Source 
keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c (keyedit_menu),
g10.c (add_keyserver_url, add_policy_url): Fix some compiler warnings.
This commit is contained in:
David Shaw 2004-05-10 21:46:00 +00:00
parent bffd021426
commit 69df506b84
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2004-05-10 David Shaw <dshaw@jabberwocky.com>
* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c
(struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c
(keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix
some compiler warnings.
2004-05-08 David Shaw <dshaw@jabberwocky.com> 2004-05-08 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing * keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing

8
g10/g10.c
View File

@ -679,8 +679,8 @@ static ARGPARSE_OPTS opts[] = {
{ opcscDriver, "pcsc-driver", 2, "@"}, { opcscDriver, "pcsc-driver", 2, "@"},
{ oDisableCCID, "disable-ccid", 0, "@"}, { oDisableCCID, "disable-ccid", 0, "@"},
{0} }; {0,NULL,0,NULL}
};
int g10_errors_seen = 0; int g10_errors_seen = 0;
@ -3649,7 +3649,7 @@ add_notation_data( const char *string, int which )
static void static void
add_policy_url( const char *string, int which ) add_policy_url( const char *string, int which )
{ {
int i,critical=0; unsigned int i,critical=0;
STRLIST sl; STRLIST sl;
if(*string=='!') if(*string=='!')
@ -3682,7 +3682,7 @@ add_policy_url( const char *string, int which )
static void static void
add_keyserver_url( const char *string, int which ) add_keyserver_url( const char *string, int which )
{ {
int i,critical=0; unsigned int i,critical=0;
STRLIST sl; STRLIST sl;
if(*string=='!') if(*string=='!')

3
g10/keyedit.c
View File

@ -1167,8 +1167,7 @@ keyedit_menu( const char *username, STRLIST locusr,
{ N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") }, { N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") },
{ N_("enable") , cmdENABLEKEY , 0,1, N_("enable a key") }, { N_("enable") , cmdENABLEKEY , 0,1, N_("enable a key") },
{ N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") }, { N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") },
{ NULL, cmdNONE, 0, 0, NULL } };
{ NULL, cmdNONE } };
enum cmdids cmd = 0; enum cmdids cmd = 0;
int rc = 0; int rc = 0;
KBNODE keyblock = NULL; KBNODE keyblock = NULL;

14
g10/keyserver.c
View File

@ -45,11 +45,11 @@
struct keyrec struct keyrec
{ {
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
time_t createtime,expiretime; u32 createtime,expiretime;
int size,flags; int size,flags;
byte type; byte type;
IOBUF uidbuf; IOBUF uidbuf;
int lines; unsigned int lines;
}; };
/* Tell remote processes about these options */ /* Tell remote processes about these options */
@ -427,11 +427,17 @@ parse_keyrec(char *keystring)
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
return ret; return ret;
if(atoi(tok)<0)
work->createtime=0;
else
work->createtime=atoi(tok); work->createtime=atoi(tok);
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
return ret; return ret;
if(atoi(tok)<0)
work->expiretime=0;
else
work->expiretime=atoi(tok); work->expiretime=atoi(tok);
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
@ -561,8 +567,8 @@ show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search)
static void static void
keyserver_search_prompt(IOBUF buffer,const char *searchstr) keyserver_search_prompt(IOBUF buffer,const char *searchstr)
{ {
int i=0,validcount=0,started=0,header=0,count=1,numlines=0; int i=0,validcount=0,started=0,header=0,count=1;
unsigned int maxlen,buflen; unsigned int maxlen,buflen,numlines=0;
KEYDB_SEARCH_DESC *desc; KEYDB_SEARCH_DESC *desc;
byte *line=NULL; byte *line=NULL;

2
g10/mainproc.c
View File

@ -242,7 +242,7 @@ static int
symkey_decrypt_seskey( DEK *dek, byte *seskey, size_t slen ) symkey_decrypt_seskey( DEK *dek, byte *seskey, size_t slen )
{ {
CIPHER_HANDLE hd; CIPHER_HANDLE hd;
int n; unsigned int n;
if ( slen < 17 || slen > 33 ) { if ( slen < 17 || slen > 33 ) {
log_error ( _("weird size for an encrypted session key (%d)\n"), log_error ( _("weird size for an encrypted session key (%d)\n"),

4
g10/options.h
View File

@ -188,8 +188,8 @@ struct
int strict; int strict;
int mangle_dos_filenames; int mangle_dos_filenames;
int enable_progress_filter; int enable_progress_filter;
int screen_columns; unsigned int screen_columns;
int screen_lines; unsigned int screen_lines;
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
const char *ctapi_driver; /* Library to access the ctAPI. */ const char *ctapi_driver; /* Library to access the ctAPI. */