security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpgsm: Improvements for NDEF in the pkcs#12 parser

Browse Source 
* sm/minip12.c (_tlv_push): Handle NDEF more correctly.
(tlv_expect_octet_string): Do not bail out on NDEF.
(dump_tag_info): Print some more infos.
--

We do not have a complete test case for this.  We need to further
analyze T6752 to see what Mozilla is doing here.  In any case with
this patch we get a bit further and don't bail out at the ndef.

GnuPG-bug-id: 6536, 6752
This commit is contained in:
Werner Koch 2023-10-10 11:36:26 +02:00
parent 4963f13f8f
commit 5601f5db98
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sm/minip12.c
View File

@ -241,14 +241,21 @@ p12_set_verbosity (int verbose, int debug)
static void static void
dump_tag_info (const char *text, struct tag_info *ti) dump_tag_info (const char *text, struct tlv_ctx_s *tlv)
{ {
if (opt_verbose > 1) struct tag_info *ti;
log_debug ("p12_parse(%s): ti.class=%d tag=%lu len=%zu nhdr=%zu %s%s\n",
text, if (opt_verbose < 2)
ti->class, ti->tag, ti->length, ti->nhdr, return;
ti->is_constructed?" cons":"",
ti->ndef?" ndef":""); ti = &tlv->ti;
log_debug ("p12_parse(%s): ti.class=%-2d tag=%-2lu len=%-4zu nhdr=%zu %s %s"
" (%u:%zu.%zu)\n",
text,
ti->class, ti->tag, ti->length, ti->nhdr,
ti->is_constructed?"cons":" ",
ti->ndef?"ndef":" ",
tlv->stacklen, tlv->bufsize, tlv->offset);
} }
@ -473,7 +480,13 @@ _tlv_push (struct tlv_ctx_s *tlv)
tlv->stack[tlv->stacklen].in_ndef = tlv->in_ndef; tlv->stack[tlv->stacklen].in_ndef = tlv->in_ndef;
tlv->stacklen++; tlv->stacklen++;
tlv->buffer += tlv->offset; tlv->buffer += tlv->offset;
tlv->bufsize = tlv->ti.length; if (tlv->ti.ndef)
{
log_assert (tlv->bufsize >= tlv->offset);
tlv->bufsize -= tlv->offset;
}
else
tlv->bufsize = tlv->ti.length;
tlv->offset = 0; tlv->offset = 0;
tlv->in_ndef = tlv->ti.ndef; tlv->in_ndef = tlv->ti.ndef;
return 0; return 0;
@ -551,7 +564,7 @@ tlv_next (struct tlv_ctx_s *tlv)
/* Set offset to the value of the TLV. */ /* Set offset to the value of the TLV. */
tlv->offset += tlv->bufsize - tlv->offset - n; tlv->offset += tlv->bufsize - tlv->offset - n;
dump_tag_info ("tlv_next", &tlv->ti); dump_tag_info ("tlv_next", tlv);
return 0; return 0;
} }
@ -706,7 +719,7 @@ tlv_expect_octet_string (struct tlv_ctx_s *tlv, int encapsulates,
&& (!tlv->ti.is_constructed || encapsulates))) && (!tlv->ti.is_constructed || encapsulates)))
return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ)); return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
p = tlv->buffer + tlv->offset; p = tlv->buffer + tlv->offset;
if (!(n=tlv->ti.length)) if (!(n=tlv->ti.length) && !tlv->ti.ndef)
return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT)); return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
if (encapsulates && tlv->ti.is_constructed if (encapsulates && tlv->ti.is_constructed