diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/cardglue.h | 2 | ||||
| -rw-r--r-- | g10/ccid-driver.c | 9 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/mainproc.c | 8 | ||||
| -rw-r--r-- | g10/options.h | 2 | ||||
| -rw-r--r-- | g10/status.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.c | 8 |
8 files changed, 29 insertions, 15 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index d33dec6cd..6292cc59e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +2004-05-22 Werner Koch <[email protected]> + + * trustdb.c (check_regexp): s/EXP/EXPR/. + + * keyedit.c (trustsig_prompt): Remoev useless range check. + + * options.h: Renamed ctrl to glo_ctrl. Changed all users. + + * ccid-driver.c (ccid_open_reader): Print a warning when CCID + can't be used. + 2004-05-21 David Shaw <[email protected]> * mainproc.c (check_sig_and_print): If we're honoring preferred diff --git a/g10/cardglue.h b/g10/cardglue.h index 454f8bf93..f6f64bc48 100644 --- a/g10/cardglue.h +++ b/g10/cardglue.h @@ -123,7 +123,7 @@ void card_set_reader_port (const char *portstr); char *serialno_and_fpr_from_sk (const unsigned char *sn, size_t snlen, PKT_secret_key *sk); -void send_status_info (CTRL ctrl, const char *keyword, ...); +void send_status_info (ctrl_t ctrl, const char *keyword, ...); void gcry_md_hash_buffer (int algo, void *digest, const void *buffer, size_t length); void log_printf (const char *fmt, ...); diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c index 3a142cacb..131693820 100644 --- a/g10/ccid-driver.c +++ b/g10/ccid-driver.c @@ -513,8 +513,13 @@ ccid_open_reader (ccid_driver_t *handle, int readerno) if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); - - XXXXX; +#if defined(GNUPG_MAJOR_VERSION) \ + || (defined(GNUPG_SCD_MAIN_HEADER) && defined(HAVE_JNLIB_LOGGING)) + log_info ("CCID can't be used - " + "please check that the device file " + "(e.g. /proc/bus/usb) " + "has appropriate permissions\n" ); +#endif free (*handle); *handle = NULL; diff --git a/g10/keyedit.c b/g10/keyedit.c index ba5020ed7..755e357bd 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -343,8 +343,6 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp) cpr_kill_prompt(); *trust_depth=atoi(p); m_free(p); - if(*trust_depth<1 || *trust_depth>255) - *trust_depth=0; } tty_printf("\n"); diff --git a/g10/mainproc.c b/g10/mainproc.c index 514ee1843..d2061e30e 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1374,9 +1374,9 @@ check_sig_and_print( CTX c, KBNODE node ) { int res; - ctrl.in_auto_key_retrieve++; + glo_ctrl.in_auto_key_retrieve++; res=keyserver_import_keyid(sig->keyid,spec); - ctrl.in_auto_key_retrieve--; + glo_ctrl.in_auto_key_retrieve--; if(!res) rc=do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); free_keyserver_spec(spec); @@ -1396,9 +1396,9 @@ check_sig_and_print( CTX c, KBNODE node ) { int res; - ctrl.in_auto_key_retrieve++; + glo_ctrl.in_auto_key_retrieve++; res=keyserver_import_keyid ( sig->keyid, opt.keyserver ); - ctrl.in_auto_key_retrieve--; + glo_ctrl.in_auto_key_retrieve--; if(!res) rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); } diff --git a/g10/options.h b/g10/options.h index d8ed34b3e..dd5c2802c 100644 --- a/g10/options.h +++ b/g10/options.h @@ -208,7 +208,7 @@ EXTERN_UNLESS_MAIN_MODULE struct { int in_auto_key_retrieve; /* True if we are doing an auto_key_retrieve. */ -} ctrl; +} glo_ctrl; #define DBG_PACKET_VALUE 1 /* debug packet reading/writing */ #define DBG_MPI_VALUE 2 /* debug mpi details */ diff --git a/g10/status.c b/g10/status.c index 91443a10a..b6e91740d 100644 --- a/g10/status.c +++ b/g10/status.c @@ -167,7 +167,7 @@ get_status_string ( int no ) static int status_currently_allowed (int no) { - if (!ctrl.in_auto_key_retrieve) + if (!glo_ctrl.in_auto_key_retrieve) return 1; /* Yes. */ /* We allow some statis anyway, so that import statistics are diff --git a/g10/trustdb.c b/g10/trustdb.c index 5cb69ccfe..9cf2eff67 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1507,19 +1507,19 @@ mark_usable_uid_certs (KBNODE keyblock, KBNODE uidnode, signature. Returns 1 for match, and 0 for no match or regex error. */ static int -check_regexp(const char *exp,const char *string) +check_regexp(const char *expr,const char *string) { #ifdef DISABLE_REGEX /* When DISABLE_REGEX is defined, assume all regexps do not match. */ return 0; #elif defined(__riscos__) - return riscos_check_regexp(exp, string, DBG_TRUST); + return riscos_check_regexp(expr, string, DBG_TRUST); #else int ret; regex_t pat; - if(regcomp(&pat,exp,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0) + if(regcomp(&pat,expr,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0) return 0; ret=regexec(&pat,string,0,NULL,0); @@ -1527,7 +1527,7 @@ check_regexp(const char *exp,const char *string) regfree(&pat); if(DBG_TRUST) - log_debug("regexp \"%s\" on \"%s\": %s\n",exp,string,ret==0?"YES":"NO"); + log_debug("regexp \"%s\" on \"%s\": %s\n",expr,string,ret==0?"YES":"NO"); return (ret==0); #endif |