diff options
| author | David Shaw <[email protected]> | 2002-11-06 16:58:28 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-06 16:58:28 +0000 |
| commit | 3cb4118b6c9c55d874d7dd463600d792f1fdd266 (patch) | |
| tree | e5ce983b4d2a340792aab3f87433f237f950310e /g10/seckey-cert.c | |
| parent | * gpgkeys_ldap.c (key_in_keylist, add_key_to_keylist, free_keylist, (diff) | |
| download | gnupg-3cb4118b6c9c55d874d7dd463600d792f1fdd266.tar.gz gnupg-3cb4118b6c9c55d874d7dd463600d792f1fdd266.zip | |
* pubkey-enc.c (get_session_key): With hidden recipients or try a given
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.
Diffstat (limited to 'g10/seckey-cert.c')
| -rw-r--r-- | g10/seckey-cert.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index d19ac683a..4984c888b 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -36,7 +36,7 @@ static int -do_check( PKT_secret_key *sk, const char *tryagain_text ) +do_check( PKT_secret_key *sk, const char *tryagain_text, int mode ) { byte *buffer; u16 csum=0; @@ -69,7 +69,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text ) keyid[3] = sk->main_keyid[1]; } dek = passphrase_to_dek( keyid, sk->pubkey_algo, sk->protect.algo, - &sk->protect.s2k, 0, tryagain_text ); + &sk->protect.s2k, mode, tryagain_text ); cipher_hd = cipher_open( sk->protect.algo, CIPHER_MODE_AUTO_CFB, 1); cipher_setkey( cipher_hd, dek->key, dek->keylen ); @@ -209,12 +209,21 @@ do_check( PKT_secret_key *sk, const char *tryagain_text ) /**************** * Check the secret key * Ask up to 3 (or n) times for a correct passphrase + * If n is negative, disable the key info prompt and make n=abs(n) */ int check_secret_key( PKT_secret_key *sk, int n ) { int rc = G10ERR_BAD_PASS; - int i; + int i,mode; + + if(n<0) + { + n=abs(n); + mode=1; + } + else + mode=0; if( n < 1 ) n = (opt.batch && !opt.use_agent)? 1 : 3; /* use the default value */ @@ -225,7 +234,7 @@ check_secret_key( PKT_secret_key *sk, int n ) tryagain = _("Invalid passphrase; please try again"); log_info (_("%s ...\n"), tryagain); } - rc = do_check( sk, tryagain ); + rc = do_check( sk, tryagain, mode ); if( rc == G10ERR_BAD_PASS && is_status_enabled() ) { u32 kid[2]; char buf[50]; |