1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-07 12:56:21 +02:00

Revert "common: Fix tlv-parser for constructed OCTET-STRING."

--
This reverts commit cc78b26a47.
This commit is contained in:
Werner Koch 2024-07-23 13:54:15 +02:00
parent 8b1f35a78f
commit ea123af9b5
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B

View File

@ -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