diff options
| author | Werner Koch <[email protected]> | 2010-04-23 11:36:59 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-04-23 11:36:59 +0000 |
| commit | 8e5010a958ded63ab6df89e1ba4d45ed9f2e572a (patch) | |
| tree | 7859b79f876bc753dd2732b3d2348684bc766dbc /g10/sign.c | |
| parent | 2010-04-23 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-8e5010a958ded63ab6df89e1ba4d45ed9f2e572a.tar.gz gnupg-8e5010a958ded63ab6df89e1ba4d45ed9f2e572a.zip | |
Decryption and signi via agent is now implemented.
Diffstat (limited to 'g10/sign.c')
| -rw-r--r-- | g10/sign.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/g10/sign.c b/g10/sign.c index 8418c5d35..d84f43379 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -314,7 +314,7 @@ do_sign (PKT_public_key *pksk, PKT_signature *sig, gcry_sexp_t s_sigval; /* FIXME: desc = gpgsm_format_keydesc (cert); */ - desc = xtrystrdup ("FIXME: Format a decription"); + desc = xtrystrdup ("FIXME: Format a description"); err = agent_pksign (NULL/*ctrl*/, hexgrip, desc, dp, gcry_md_get_algo_dlen (mdalgo), mdalgo, @@ -811,7 +811,9 @@ sign_file( strlist_t filenames, int detached, strlist_t locusr, duration=parse_expire_string(opt.def_sig_expire); } - if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) ) + /* Note: In the old non-agent version the following call used to + unprotect the secret key. This is now done on demand by the agent. */ + if( (rc = build_sk_list (locusr, &sk_list, PUBKEY_USAGE_SIG )) ) goto leave; if(PGP2 && !only_old_style(sk_list)) @@ -1126,7 +1128,9 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile ) duration=parse_expire_string(opt.def_sig_expire); } - if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) ) + /* Note: In the old non-agent version the following call used to + unprotect the secret key. This is now done on demand by the agent. */ + if( (rc=build_sk_list( locusr, &sk_list, PUBKEY_USAGE_SIG )) ) goto leave; if( !old_style && !duration ) @@ -1290,7 +1294,9 @@ sign_symencrypt_file (const char *fname, strlist_t locusr) duration=parse_expire_string(opt.def_sig_expire); } - rc = build_sk_list (locusr, &sk_list, 1, PUBKEY_USAGE_SIG); + /* Note: In the old non-agent version the following call used to + unprotect the secret key. This is now done on demand by the agent. */ + rc = build_sk_list (locusr, &sk_list, PUBKEY_USAGE_SIG); if (rc) goto leave; |