From ea123af9b57fe865efc035bd828dd3a187cb0f02 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 23 Jul 2024 13:54:15 +0200 Subject: Revert "common: Fix tlv-parser for constructed OCTET-STRING." -- This reverts commit cc78b26a4729db2280334214e21a8847e95d2ab0. --- common/tlv-parser.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'common/tlv-parser.c') diff --git a/common/tlv-parser.c b/common/tlv-parser.c index bc22c4f4f..2cafac3e9 100644 --- a/common/tlv-parser.c +++ b/common/tlv-parser.c @@ -556,10 +556,7 @@ tlv_expect_octet_string (tlv_parser_t tlv, int encapsulates, && (!tlv->ti.is_constructed || encapsulates))) return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ)); p = tlv->buffer; - n = tlv->ti.length; - if (!n && tlv->ti.ndef) - n = tlv->bufsize; - else if (!tlv->ti.length) + if (!(n=tlv->ti.length) && !tlv->ti.ndef) return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT)); if (encapsulates && tlv->ti.is_constructed -- cgit v1.2.3