diff options
| author | NIIBE Yutaka <[email protected]> | 2024-04-09 00:24:11 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-05-16 00:42:39 +0000 |
| commit | 0eefa08295b2d19f6f3066b925e001833934a1f0 (patch) | |
| tree | 8d0be8d86401fa1020bc4976cd1b75de4a3eca1c | |
| parent | Update NEWS (diff) | |
| download | gnupg-0eefa08295b2d19f6f3066b925e001833934a1f0.tar.gz gnupg-0eefa08295b2d19f6f3066b925e001833934a1f0.zip | |
gpg: Allow no CRC24 checksum in armor.
* g10/armor.c (radix64_read): Detect the end of armor when
there is no CRC24 checksum.
--
Cherry-pick master commit of:
3a344d6236521d768793e8b34a96a18ce13bab0e
GnuPG-bug-id: 7071
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/armor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/armor.c b/g10/armor.c index b47c04ab3..81af15339 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -1031,10 +1031,10 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, checkcrc++; break; } - else if (afx->dearmor_state && c == '-' + else if (c == '-' && afx->buffer_pos + 8 < afx->buffer_len && !strncmp (afx->buffer, "-----END ", 8)) { - break; /* End in --dearmor mode. */ + break; /* End in --dearmor mode or No CRC. */ } else { log_error(_("invalid radix64 character %02X skipped\n"), c); |