diff options
| author | Werner Koch <[email protected]> | 2014-12-15 08:50:19 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-12-15 08:50:19 +0000 |
| commit | fc9a35d2dec2f838abac831fd88dca494773e082 (patch) | |
| tree | 1d4a1204e2339bdaa9d5aa73ff226d8f7707e53f /g10/sign.c | |
| parent | gpg: Avoid extra LF in notaion data listing. (diff) | |
| download | gnupg-fc9a35d2dec2f838abac831fd88dca494773e082.tar.gz gnupg-fc9a35d2dec2f838abac831fd88dca494773e082.zip | |
gpg: Fix regression in notation data regression.
* g10/misc.c (pct_expando): Reorder conditions for clarity.
* g10/sign.c (write_signature_packets): Fix notation data creation.
--
Also re-added the check for signature version > 3.
Reported-by: MFPA
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/sign.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/g10/sign.c b/g10/sign.c index 2e62f04f2..272451306 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -700,8 +700,11 @@ write_signature_packets (SK_LIST sk_list, IOBUF out, gcry_md_hd_t hash, if (gcry_md_copy (&md, hash)) BUG (); - build_sig_subpkt_from_sig (sig); - mk_notation_policy_etc (sig, pk, NULL); + if (sig->version >= 4) + { + build_sig_subpkt_from_sig (sig); + mk_notation_policy_etc (sig, NULL, pk); + } hash_sigversion_to_magic (md, sig); gcry_md_final (md); |