security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-28 21:50:02 +02:00
Code Activity

agent: Fix import of non-protected gpg keys.

Browse Source 
* agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
non-protected keys.
(convert_from_openpgp_main): Do not call agent_askpin for a
non-protected key.
This commit is contained in:
Werner Koch 2014-05-08 10:24:36 +02:00
parent cb2aeb4e11
commit 4aeb02562c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/cvt-openpgp.c
View File

@ -397,7 +397,8 @@ do_unprotect (const char *passphrase,
if (actual_csum != desired_csum) if (actual_csum != desired_csum)
return gpg_error (GPG_ERR_CHECKSUM); return gpg_error (GPG_ERR_CHECKSUM);
return 0;
goto do_convert;
} }
@ -595,6 +596,7 @@ do_unprotect (const char *passphrase,
if (actual_csum != desired_csum) if (actual_csum != desired_csum)
return gpg_error (GPG_ERR_BAD_PASSPHRASE); return gpg_error (GPG_ERR_BAD_PASSPHRASE);
do_convert:
if (nskey != skeylen) if (nskey != skeylen)
err = gpg_error (GPG_ERR_BAD_SECKEY); err = gpg_error (GPG_ERR_BAD_SECKEY);
else else
@ -905,7 +907,11 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp,
pi_arg.r_key = &s_skey; pi_arg.r_key = &s_skey;
err = gpg_error (GPG_ERR_BAD_PASSPHRASE); err = gpg_error (GPG_ERR_BAD_PASSPHRASE);
if (cache_nonce) if (!is_protected)
{
err = try_do_unprotect_cb (pi);
}
else if (cache_nonce)
{ {
char *cache_value; char *cache_value;
@ -928,7 +934,7 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp,
if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE && !from_native) if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE && !from_native)
err = agent_askpin (ctrl, prompt, NULL, NULL, pi); err = agent_askpin (ctrl, prompt, NULL, NULL, pi);
skeyidx = pi_arg.skeyidx; skeyidx = pi_arg.skeyidx;
if (!err && r_passphrase) if (!err && r_passphrase && is_protected)
{ {
*r_passphrase = xtrystrdup (pi->pin); *r_passphrase = xtrystrdup (pi->pin);
if (!*r_passphrase) if (!*r_passphrase)