| @@ -2713,26 +2713,27 @@ pgpv_verify(pgpv_cursor_t *cursor, pgpv_ | | | @@ -2713,26 +2713,27 @@ pgpv_verify(pgpv_cursor_t *cursor, pgpv_ |
| 2713 | if (onepass->hashalg != signature->hashalg) { | | 2713 | if (onepass->hashalg != signature->hashalg) { |
| 2714 | snprintf(cursor->why, sizeof(cursor->why), "Signature hashalg %u does not match onepass hashalg %u", | | 2714 | snprintf(cursor->why, sizeof(cursor->why), "Signature hashalg %u does not match onepass hashalg %u", |
| 2715 | signature->hashalg, onepass->hashalg); | | 2715 | signature->hashalg, onepass->hashalg); |
| 2716 | return 0; | | 2716 | return 0; |
| 2717 | } | | 2717 | } |
| 2718 | if (onepass->keyalg != signature->keyalg) { | | 2718 | if (onepass->keyalg != signature->keyalg) { |
| 2719 | snprintf(cursor->why, sizeof(cursor->why), "Signature keyalg %u does not match onepass keyalg %u", | | 2719 | snprintf(cursor->why, sizeof(cursor->why), "Signature keyalg %u does not match onepass keyalg %u", |
| 2720 | signature->keyalg, onepass->keyalg); | | 2720 | signature->keyalg, onepass->keyalg); |
| 2721 | return 0; | | 2721 | return 0; |
| 2722 | } | | 2722 | } |
| 2723 | if (cursor->pgp->ssh) { | | 2723 | if (cursor->pgp->ssh) { |
| 2724 | fixup_ssh_keyid(cursor->pgp, signature, "sha1"); | | 2724 | fixup_ssh_keyid(cursor->pgp, signature, "sha1"); |
| 2725 | } | | 2725 | } |
| | | 2726 | sub = 0; |
| 2726 | if ((j = find_keyid(cursor->pgp, NULL, onepass->keyid, &sub)) < 0) { | | 2727 | if ((j = find_keyid(cursor->pgp, NULL, onepass->keyid, &sub)) < 0) { |
| 2727 | fmt_binary(strkeyid, sizeof(strkeyid), onepass->keyid, (unsigned)sizeof(onepass->keyid)); | | 2728 | fmt_binary(strkeyid, sizeof(strkeyid), onepass->keyid, (unsigned)sizeof(onepass->keyid)); |
| 2728 | snprintf(cursor->why, sizeof(cursor->why), "Signature key id %s not found ", strkeyid); | | 2729 | snprintf(cursor->why, sizeof(cursor->why), "Signature key id %s not found ", strkeyid); |
| 2729 | return 0; | | 2730 | return 0; |
| 2730 | } | | 2731 | } |
| 2731 | if (!match_sig_id(cursor, signature, litdata, (unsigned)j, sub)) { | | 2732 | if (!match_sig_id(cursor, signature, litdata, (unsigned)j, sub)) { |
| 2732 | return 0; | | 2733 | return 0; |
| 2733 | } | | 2734 | } |
| 2734 | ARRAY_APPEND(cursor->datacookies, pkt); | | 2735 | ARRAY_APPEND(cursor->datacookies, pkt); |
| 2735 | j = ((j & 0xffffff) << 8) | (sub & 0xff); | | 2736 | j = ((j & 0xffffff) << 8) | (sub & 0xff); |
| 2736 | ARRAY_APPEND(cursor->found, j); | | 2737 | ARRAY_APPEND(cursor->found, j); |
| 2737 | return pkt + 1; | | 2738 | return pkt + 1; |
| 2738 | } | | 2739 | } |