aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2025-11-11 05:28:06 +0000
committerNIIBE Yutaka <[email protected]>2025-11-11 05:28:06 +0000
commit62b8bf2f390533d23e24d27552fecf562752d358 (patch)
tree6d8d07a82c2fac410701ef773cce8031dee0ed13
parentdirmngr: Fix OCSP check. (diff)
downloadgnupg-62b8bf2f390533d23e24d27552fecf562752d358.tar.gz
gnupg-62b8bf2f390533d23e24d27552fecf562752d358.zip
gpg: Fix armored input parsing.
* g10/armor.c (radix64_read): Fix counting of characters in the trailer. -- Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--g10/armor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/armor.c b/g10/armor.c
index 59a6202aa..9ea412ae3 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1039,9 +1039,9 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn,
checkcrc++;
break;
}
- else if (c == '-'
- && afx->buffer_pos + 8 < afx->buffer_len
- && !strncmp (afx->buffer, "-----END ", 8)) {
+ else if (afx->buffer_pos == 1 && c == '-'
+ && afx->buffer_len > 9
+ && !strncmp (afx->buffer, "-----END ", 9)) {
break; /* End in --dearmor mode or No CRC. */
}
else {