diff options
| author | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
| commit | caddeef4a7ffe5f2eb6453d364b6ae152e0f6625 (patch) | |
| tree | 5894e3f0e365b0c9035efecea2bbd5ad3042ca51 /g10/sign.c | |
| parent | kbx: Switch from MD5 to SHA-1 for the checksum. (diff) | |
| parent | gpg: Implement card_store_subkey again. (diff) | |
| download | gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.tar.gz gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.zip | |
Merge branch 'master' into key-storage-work
Diffstat (limited to '')
| -rw-r--r-- | g10/sign.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/sign.c b/g10/sign.c index 6ff7df6a9..8944067d7 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -272,6 +272,7 @@ do_sign (PKT_public_key *pksk, PKT_signature *sig, desc = gpg_format_keydesc (pksk, 0, 1); err = agent_pksign (NULL/*ctrl*/, cache_nonce, hexgrip, desc, + pksk->keyid, pksk->main_keyid, pksk->pubkey_algo, dp, gcry_md_get_algo_dlen (mdalgo), mdalgo, &s_sigval); xfree (desc); @@ -1604,6 +1605,8 @@ update_keysig_packet( PKT_signature **ret_sig, /* create a new signature packet */ sig = copy_signature (NULL, orig_sig); + sig->digest_algo=digest_algo; + /* We need to create a new timestamp so that new sig expiration calculations are done correctly... */ sig->timestamp=make_timestamp(); |