security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

* pkclist.c (check_signatures_trust): Always print the warning for

Browse Source 
unknown and undefined trust.  Removed the did_add cruft.  Reported
by Janusz A. Urbanowicz.
* g10.c: New option --no-use-agent.
Hmmm, is this a a good name?  --do-not-use-agent seems a bit to long.
This commit is contained in:
Werner Koch 2002-02-14 11:51:00 +00:00
parent 05705bcb1c
commit 69688eab52
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2002-02-14 Werner Koch <wk@gnupg.org>
* g10.c: New option --no-use-agent.
* pkclist.c (check_signatures_trust): Always print the warning for
unknown and undefined trust. Removed the did_add cruft. Reported
by Janusz A. Urbanowicz.
2002-02-11 David Shaw <dshaw@jabberwocky.com> 2002-02-11 David Shaw <dshaw@jabberwocky.com>
* hkp.c (parse_hkp_index): Bug fix - properly handle user IDs with * hkp.c (parse_hkp_index): Bug fix - properly handle user IDs with

3
g10/g10.c
View File

@ -255,6 +255,7 @@ enum cmd_and_opt_values { aNull = 0,
oAutoKeyRetrieve, oAutoKeyRetrieve,
oNoAutoKeyRetrieve, oNoAutoKeyRetrieve,
oUseAgent, oUseAgent,
oNoUseAgent,
oGpgAgentInfo, oGpgAgentInfo,
oMergeOnly, oMergeOnly,
oTryAllSecrets, oTryAllSecrets,
@ -371,6 +372,7 @@ static ARGPARSE_OPTS opts[] = {
{ oDryRun, "dry-run", 0, N_("do not make any changes") }, { oDryRun, "dry-run", 0, N_("do not make any changes") },
/*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */ /*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */
{ oUseAgent, "use-agent",0, N_("use the gpg-agent")}, { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
{ oNoUseAgent, "no-use-agent",0, "@"},
{ oGpgAgentInfo, "gpg-agent-info",2, "@"}, { oGpgAgentInfo, "gpg-agent-info",2, "@"},
{ oBatch, "batch", 0, N_("batch mode: never ask")}, { oBatch, "batch", 0, N_("batch mode: never ask")},
{ oAnswerYes, "yes", 0, N_("assume yes on most questions")}, { oAnswerYes, "yes", 0, N_("assume yes on most questions")},
@ -971,6 +973,7 @@ main( int argc, char **argv )
not_implemented("use-agent"); not_implemented("use-agent");
#endif /* __riscos__ */ #endif /* __riscos__ */
break; break;
case oNoUseAgent: opt.use_agent = 0; break;
case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break; case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break;
case oAnswerYes: opt.answer_yes = 1; break; case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break; case oAnswerNo: opt.answer_no = 1; break;

15
g10/pkclist.c
View File

@ -527,7 +527,6 @@ check_signatures_trust( PKT_signature *sig )
{ {
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = m_alloc_clear( sizeof *pk );
unsigned int trustlevel; unsigned int trustlevel;
int did_add = 0;
int rc=0; int rc=0;
if ( opt.always_trust) if ( opt.always_trust)
@ -579,14 +578,12 @@ check_signatures_trust( PKT_signature *sig )
/* fall thru */ /* fall thru */
case TRUST_UNKNOWN: case TRUST_UNKNOWN:
case TRUST_UNDEFINED: case TRUST_UNDEFINED:
if( did_add || opt.batch || opt.answer_no ) { write_status( STATUS_TRUST_UNDEFINED );
write_status( STATUS_TRUST_UNDEFINED ); log_info(_("WARNING: This key is not certified with"
log_info(_("WARNING: This key is not certified with" " a trusted signature!\n"));
" a trusted signature!\n")); log_info(_(" There is no indication that the "
log_info(_(" There is no indication that the " "signature belongs to the owner.\n" ));
"signature belongs to the owner.\n" )); print_fingerprint (pk, NULL, 1);
print_fingerprint (pk, NULL, 1);
}
break; break;
case TRUST_NEVER: case TRUST_NEVER: