security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00
Code Activity

* pubkey-enc.c (get_session_key): With hidden recipients or try a given

Browse source 
passphrase against all secret keys rather than trying all secret keys in
turn.  Don't if --try-all-secrets or --status-fd is enabled.

* passphrase.c (passphrase_to_dek): Mode 1 means do a regular passphrase
query, but don't prompt with the key info.

* seckey-cert.c (do_check, check_secret_key): A negative ask count means
to enable passphrase mode 1.

* keydb.h, getkey.c (enum_secret_keys): Add flag to include
secret-parts-missing keys (or not) in the list.
This commit is contained in:
David Shaw 2002-11-06 16:58:28 +00:00
parent ec0d9a416e
commit 3cb4118b6c
6 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/pubkey-enc.c
View file

@ -85,12 +85,13 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
else { /* anonymous receiver: Try all available secret keys */
void *enum_context = NULL;
u32 keyid[2];
char *p;
for(;;) {
if( sk )
free_secret_key( sk );
sk = m_alloc_clear( sizeof *sk );
rc=enum_secret_keys( &enum_context, sk, 1);
rc=enum_secret_keys( &enum_context, sk, 1, 0);
if( rc ) {
rc = G10ERR_NO_SECKEY;
break;
@ -100,7 +101,17 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
keyid_from_sk( sk, keyid );
log_info(_("anonymous recipient; trying secret key %08lX ...\n"),
(ulong)keyid[1] );
rc = check_secret_key( sk, 1 ); /* ask only once */
if(!opt.try_all_secrets && !is_status_enabled())
{
p=get_last_passphrase();
set_next_passphrase(p);
m_free(p);
}
rc = check_secret_key( sk, opt.try_all_secrets?1:-1 ); /* ask
only
once */
if( !rc )
rc = get_it( k, dek, sk, keyid );
if( !rc ) {
@ -108,7 +119,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
break;
}
}
enum_secret_keys( &enum_context, NULL, 0 ); /* free context */
enum_secret_keys( &enum_context, NULL, 0, 0 ); /* free context */
}
leave: