diff options
Diffstat (limited to 'g10/sig-check.c')
| -rw-r--r-- | g10/sig-check.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c index eb6c9669d..9978cba60 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -574,10 +574,18 @@ check_signature_end_simple (PKT_public_key *pk, PKT_signature *sig, if (sig->hashed) { n = sig->hashed->len; + if (sig->version == 5) + { + gcry_md_putc (digest, (n >> 24) ); + gcry_md_putc (digest, (n >> 16) ); + } gcry_md_putc (digest, (n >> 8) ); gcry_md_putc (digest, n ); gcry_md_write (digest, sig->hashed->data, n); - n += 6; + if (sig->version == 5) + n += 8; + else + n += 6; } else { @@ -1032,6 +1040,9 @@ check_signature_over_key_or_uid (ctrl_t ctrl, PKT_public_key *signer, /* Hash the relevant data. */ + if (sig->version == 5) + gcry_md_write (md, sig->v5_salt, 16); + if (IS_KEY_SIG (sig) || IS_KEY_REV (sig)) { log_assert (packet->pkttype == PKT_PUBLIC_KEY); |