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

sm: More improvements for PKCS#12 parsing for latest IVBB changes.

Browse Source 
* common/tlv.h (TLV_PARSER_FLAG_T5793): New.
(tlv_parser_new): New macro.  Rename function with an underscore.
(tlv_next_with_flag): New.
* common/tlv-parser.c (struct tlv_parser_s): Remove const from buffer.
Add fields crammed, lasttlv, and origoff.  Remove bufferlist ands ist
definition.
(dump_to_file): New but disabled debug helper.
(parse_tag): Print more info on error.
(_tlv_parser_new): Add args lasttlv and LNO.  Take a copy of the data.
(_tlv_parser_release): Free the copy of the buffer and return the
recorded TLV object from tlv_parser_new.
(_tlv_peek, tlv_parser_peek, _tlv_parser_peek_null): Remove.
(_tlv_push): Record crammed length.
(_tlv_pop): Restore crammed length.
(_tlv_parser_next): Add arg flags.  More debug output.  Handle cramming
here.  Take care of cramming here.
(tlv_expect_object): Simplify to adjust for changes in _tlv_parser_next.
(tlv_expect_octet_string): Remove arg encapsulates.  Adjust for
changes in _tlv_parser_next.  Change all allers.
(tlv_expect_null): New.
(cram_octet_string): Rewrite.
(need_octet_string_cramming): Remove.

* sm/minip12.c (dump_to_file): New.  Enablein debug mode and if a
envvar ist set.  Replace all explict but disabled dumping to call this
function.
(parse_bag_encrypted_data): Replace tlv_peek_null and a peeking for an
optional SET by non-peeking code.
(parse_cert_bag): Ditto.
(parse_shrouded_key_bag): Replace tlv_peek_null by non-peeking code.
(parse_bag_encrypted_data): Use the new TLV_PARSER_FLAG_T5793 to
enable the Mozilla workaround.
(parse_bag_encrypted_data): Replace the 'renewed_tlv' code by the new
tlv_parser_release semantics.
(parse_shrouded_key_bag): Ditto.
(parse_shrouded_key_bag): Create a new context instead of using the
former encapsulated mechanism for tlv_expect_octet_string.
(parse_bag_data): Ditto.
(p12_parse): Ditto.
--

GnuPG-bug-id: 7213

Fixing this took way too long; I should have earlier explained the
code to a co-hacker to find the problem myself in my code by this.
This commit is contained in:
Werner Koch 2024-08-06 17:51:01 +02:00
parent 5409b273a6
commit 690fd61a0c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 450 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

497
common/tlv-parser.c
View File

@ -1,5 +1,5 @@
/* tlv-parser.c - Parse BER encoded objects /* tlv-parser.c - Parse BER encoded objects
* Copyright (C) 2023 g10 Code GmbH * Copyright (C) 2023, 2024 g10 Code GmbH
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -32,24 +32,26 @@
#define TLV_MAX_DEPTH 25 #define TLV_MAX_DEPTH 25
struct bufferlist_s
{
struct bufferlist_s *next;
char *buffer;
};
/* An object to control the ASN.1 parsing. */ /* An object to control the ASN.1 parsing. */
struct tlv_parser_s struct tlv_parser_s
{ {
/* The original buffer with the entire pkcs#12 object and its length. */ /* The original buffer with the entire pkcs#12 object and its length. */
const unsigned char *origbuffer; unsigned char *origbuffer;
size_t origbufsize; size_t origbufsize;
/* The original offset for debugging. */
size_t origoff;
/* Here we keep a copy of the former TLV. This is returned by
* tlv_parser_release. */
tlv_parser_t lasttlv;
/* The current buffer we are working on and its length. */ /* The current buffer we are working on and its length. */
const unsigned char *buffer; unsigned char *buffer;
size_t bufsize; size_t bufsize;
size_t crammed; /* 0 or actual length of crammed octet strings. */
int in_ndef; /* Flag indicating that we are in a NDEF. */ int in_ndef; /* Flag indicating that we are in a NDEF. */
int pending; /* The last tlv_next has not yet been processed. */ int pending; /* The last tlv_next has not yet been processed. */
@ -58,22 +60,18 @@ struct tlv_parser_s
const char *lastfunc;/* Name of last called function. */ const char *lastfunc;/* Name of last called function. */
int verbosity; /* Arg from tlv_parser_new. */ int verbosity; /* Arg from tlv_parser_new. */
struct bufferlist_s *bufferlist; /* To keep track of malloced buffers. */
unsigned int stacklen; /* Used size of the stack. */ unsigned int stacklen; /* Used size of the stack. */
struct { struct {
const unsigned char *buffer; /* Saved value of BUFFER. */ unsigned char *buffer; /* Saved value of BUFFER. */
size_t bufsize; /* Saved value of BUFSIZE. */ size_t bufsize; /* Saved value of BUFSIZE. */
size_t length; /* Length of the container (ti.length). */ size_t length; /* Length of the container (ti.length). */
size_t crammed; /* Saved CRAMMED value. */
int in_ndef; /* Saved IN_NDEF flag (ti.ndef). */ int in_ndef; /* Saved IN_NDEF flag (ti.ndef). */
} stack[TLV_MAX_DEPTH]; } stack[TLV_MAX_DEPTH];
}; };
static unsigned char *cram_octet_string (const unsigned char *input, static size_t cram_octet_string (tlv_parser_t tlv, int testmode);
size_t length, size_t *r_newlength);
static int need_octet_string_cramming (const unsigned char *input,
size_t length);
@ -87,12 +85,10 @@ _tlv_parser_dump_tag (const char *text, int lno, tlv_parser_t tlv)
ti = &tlv->ti; ti = &tlv->ti;
log_debug ("p12_parse:%s:%d: @%04zu class=%d tag=%lu len=%zu nhdr=%zu %s%s\n", log_debug ("%s:%d: %zu@%04zu class=%d tag=%lu %c len=%zu%s nhdr=%zu\n",
text, lno, text, lno, tlv->origoff, tlv_parser_offset (tlv) - ti->nhdr,
(size_t)(tlv->buffer - tlv->origbuffer) - ti->nhdr, ti->class, ti->tag, ti->is_constructed?'c':'p',
ti->class, ti->tag, ti->length, ti->nhdr, ti->length,ti->ndef?" ndef":"", ti->nhdr);
ti->is_constructed?" cons":"",
ti->ndef?" ndef":"");
} }
@ -103,16 +99,36 @@ _tlv_parser_dump_state (const char *text, const char *text2,
if (!tlv || tlv->verbosity < 2) if (!tlv || tlv->verbosity < 2)
return; return;
log_debug ("p12_parse:%s%s%s:%d: @%04zu lvl=%u %s\n", log_debug ("p12_parse:%s%s%s:%d: %zu@%04zu lvl=%u %s\n",
text, text,
text2? "/":"", text2? text2:"", text2? "/":"", text2? text2:"",
lno, lno, tlv->origoff, tlv_parser_offset (tlv),
(size_t)(tlv->buffer - tlv->origbuffer),
tlv->stacklen, tlv->stacklen,
tlv->in_ndef? " in-ndef":""); tlv->in_ndef? " in-ndef":"");
} }
static void
dump_to_file (const void *s, size_t n, const char *name)
{
#if 0
FILE *fp;
char fname[100];
static int fcount;
snprintf (fname, sizeof fname, "tmp-%03d-%s", ++fcount, name);
log_debug ("dumping %zu bytes to '%s'\n", n, fname);
fp = fopen (fname, "wb");
if (!fp || fwrite (s, n, 1, fp) != 1)
exit (2);
fclose (fp);
#else
(void)s;
(void)n;
(void)name;
#endif
}
/* Parse the buffer at the address BUFFER which is of SIZE and return /* Parse the buffer at the address BUFFER which is of SIZE and return
* the tag and the length part from the TLV triplet. Update BUFFER * the tag and the length part from the TLV triplet. Update BUFFER
@ -135,7 +151,12 @@ parse_tag (unsigned char const **buffer, size_t *size, struct tag_info *ti)
ti->tag = tag; ti->tag = tag;
if (ti->length > *size) if (ti->length > *size)
return gpg_error (GPG_ERR_BUFFER_TOO_SHORT); /* data larger than buffer. */ {
/* data larger than buffer. */
log_debug ("%s: ti->length=%zu for a buffer of size=%zu\n",
__func__, ti->length, *size);
return gpg_error (GPG_ERR_BUFFER_TOO_SHORT);
}
return 0; return 0;
} }
@ -150,95 +171,63 @@ tlv_parse_tag (unsigned char const **buffer, size_t *size, struct tag_info *ti)
/* Create a new TLV object. */ /* Create a new TLV object. */
tlv_parser_t tlv_parser_t
tlv_parser_new (const unsigned char *buffer, size_t bufsize, int verbosity) _tlv_parser_new (const unsigned char *buffer, size_t bufsize,
int verbosity, tlv_parser_t lasttlv, int lno)
{ {
tlv_parser_t tlv; tlv_parser_t tlv;
if (verbosity > 1)
log_debug ("%s:%d: %zu@%zu (%p,%zu)\n", __func__, lno,
lasttlv?lasttlv->origoff:0, tlv_parser_offset (lasttlv),
buffer, bufsize);
tlv = xtrycalloc (1, sizeof *tlv); tlv = xtrycalloc (1, sizeof *tlv);
if (tlv) if (tlv)
{ {
tlv->origbuffer = buffer; char *mybuf = xtrymalloc ( bufsize + 1);
if (!mybuf)
{
xfree (tlv);
return NULL;
}
memcpy (mybuf, buffer, bufsize);
mybuf[bufsize] = 0;
tlv->origbuffer = mybuf;
tlv->origbufsize = bufsize; tlv->origbufsize = bufsize;
tlv->buffer = buffer; tlv->origoff = tlv_parser_offset (lasttlv);
tlv->buffer = mybuf;
tlv->bufsize = bufsize; tlv->bufsize = bufsize;
tlv->crammed = 0;
tlv->verbosity = verbosity; tlv->verbosity = verbosity;
tlv->lasttlv = lasttlv;
dump_to_file (mybuf, bufsize, "context");
} }
return tlv; return tlv;
} }
/* This function can be used to store a malloced buffer into the TLV /* Free the TLV object and returns the last TLV object stored in this
* object. Ownership of BUFFER is thus transferred to TLV. This * TLV. */
* buffer will then only be released by tlv_release. */ tlv_parser_t
static gpg_error_t _tlv_parser_release (tlv_parser_t tlv, int lno)
register_buffer (tlv_parser_t tlv, char *buffer)
{ {
struct bufferlist_s *item; tlv_parser_t result;
item = xtrycalloc (1, sizeof *item);
if (!item)
return gpg_error_from_syserror ();
item->buffer = buffer;
item->next = tlv->bufferlist;
tlv->bufferlist = item;
return 0;
}
void
tlv_parser_release (tlv_parser_t tlv)
{
if (!tlv) if (!tlv)
return; return NULL;
while (tlv->bufferlist) result = tlv->lasttlv;
if (tlv->verbosity > 1)
{ {
struct bufferlist_s *save = tlv->bufferlist->next; if (result)
xfree (tlv->bufferlist->buffer); log_debug ("%s:%d: done; returning last TLV %zu@%zu (%p,%zu)\n",
xfree (tlv->bufferlist); __func__, lno, result->origoff,
tlv->bufferlist = save; tlv_parser_offset (result), result->buffer, result->bufsize);
else
log_debug ("%s:%d: done\n", __func__, lno);
} }
xfree (tlv->origbuffer);
xfree (tlv); xfree (tlv);
} return result;
/* Helper for the tlv_peek functions. */
static gpg_error_t
_tlv_peek (tlv_parser_t tlv, struct tag_info *ti)
{
const unsigned char *p;
size_t n;
/* Note that we want to peek ahead of any current container but of
* course not beyond our entire buffer. */
p = tlv->buffer;
if ((p - tlv->origbuffer) > tlv->origbufsize)
return gpg_error (GPG_ERR_BUG);
n = tlv->origbufsize - (p - tlv->origbuffer);
return parse_tag (&p, &n, ti);
}
/* Look for the next tag and return true if it matches CLASS and TAG.
* Otherwise return false. No state is changed. */
int
_tlv_parser_peek (tlv_parser_t tlv, int class, int tag)
{
struct tag_info ti;
return (!_tlv_peek (tlv, &ti)
&& ti.class == class && ti.tag == tag);
}
/* Look for the next tag and return true if it is the Null tag.
* Otherwise return false. No state is changed. */
int
_tlv_parser_peek_null (tlv_parser_t tlv)
{
struct tag_info ti;
return (!_tlv_peek (tlv, &ti)
&& ti.class == CLASS_UNIVERSAL && ti.tag == TAG_NULL
&& !ti.is_constructed && !ti.length);
} }
@ -246,6 +235,7 @@ _tlv_parser_peek_null (tlv_parser_t tlv)
static gpg_error_t static gpg_error_t
_tlv_push (tlv_parser_t tlv) _tlv_push (tlv_parser_t tlv)
{ {
/* Right now our pointer is at the value of the current container. /* Right now our pointer is at the value of the current container.
* We push that info onto the stack. */ * We push that info onto the stack. */
if (tlv->stacklen >= TLV_MAX_DEPTH) if (tlv->stacklen >= TLV_MAX_DEPTH)
@ -254,6 +244,7 @@ _tlv_push (tlv_parser_t tlv)
tlv->stack[tlv->stacklen].bufsize = tlv->bufsize; tlv->stack[tlv->stacklen].bufsize = tlv->bufsize;
tlv->stack[tlv->stacklen].in_ndef = tlv->in_ndef; tlv->stack[tlv->stacklen].in_ndef = tlv->in_ndef;
tlv->stack[tlv->stacklen].length = tlv->ti.length; tlv->stack[tlv->stacklen].length = tlv->ti.length;
tlv->stack[tlv->stacklen].crammed = tlv->crammed;
tlv->stacklen++; tlv->stacklen++;
tlv->in_ndef = tlv->ti.ndef; tlv->in_ndef = tlv->ti.ndef;
@ -278,7 +269,7 @@ _tlv_push (tlv_parser_t tlv)
static gpg_error_t static gpg_error_t
_tlv_pop (tlv_parser_t tlv) _tlv_pop (tlv_parser_t tlv)
{ {
size_t lastlen; size_t length;
/* We reached the end of a container, either due to the size limit /* We reached the end of a container, either due to the size limit
* or due to an end tag. Now we pop the last container so that we * or due to an end tag. Now we pop the last container so that we
@ -288,6 +279,8 @@ _tlv_pop (tlv_parser_t tlv)
tlv->stacklen--; tlv->stacklen--;
tlv->in_ndef = tlv->stack[tlv->stacklen].in_ndef; tlv->in_ndef = tlv->stack[tlv->stacklen].in_ndef;
length = tlv->ti.length = tlv->stack[tlv->stacklen].length;
tlv->crammed = tlv->stack[tlv->stacklen].crammed;
if (tlv->in_ndef) if (tlv->in_ndef)
{ {
/* We keep buffer but adjust bufsize to the end of the origbuffer. */ /* We keep buffer but adjust bufsize to the end of the origbuffer. */
@ -297,19 +290,19 @@ _tlv_pop (tlv_parser_t tlv)
} }
else else
{ {
lastlen = tlv->stack[tlv->stacklen].length;
tlv->buffer = tlv->stack[tlv->stacklen].buffer; tlv->buffer = tlv->stack[tlv->stacklen].buffer;
tlv->bufsize = tlv->stack[tlv->stacklen].bufsize; tlv->bufsize = tlv->stack[tlv->stacklen].bufsize;
if (lastlen > tlv->bufsize) if (length > tlv->bufsize)
{ {
log_debug ("%s: container length larger than buffer (%zu/%zu)\n", if (tlv->verbosity > 1)
__func__, lastlen, tlv->bufsize); log_debug ("%s: container larger than buffer (%zu/%zu)\n",
__func__, length, tlv->bufsize);
return gpg_error (GPG_ERR_INV_BER); return gpg_error (GPG_ERR_INV_BER);
} }
tlv->buffer += lastlen; tlv->buffer += length;
tlv->bufsize -= lastlen; tlv->bufsize -= length;
}
}
_tlv_parser_dump_state (__func__, NULL, 0, tlv); _tlv_parser_dump_state (__func__, NULL, 0, tlv);
return 0; return 0;
} }
@ -318,9 +311,13 @@ _tlv_pop (tlv_parser_t tlv)
/* Parse the next tag and value. Also detect the end of a /* Parse the next tag and value. Also detect the end of a
* container. The caller should use the tlv_next macro. */ * container. The caller should use the tlv_next macro. */
gpg_error_t gpg_error_t
_tlv_parser_next (tlv_parser_t tlv, int lno) _tlv_parser_next (tlv_parser_t tlv, unsigned int flag, int lno)
{ {
gpg_error_t err; gpg_error_t err;
const unsigned char *buffer;
size_t save_bufsize;
const unsigned char *save_buffer;
int i;
tlv->lasterr = 0; tlv->lasterr = 0;
tlv->lastfunc = __func__; tlv->lastfunc = __func__;
@ -329,34 +326,68 @@ _tlv_parser_next (tlv_parser_t tlv, int lno)
{ {
tlv->pending = 0; tlv->pending = 0;
if (tlv->verbosity > 1) if (tlv->verbosity > 1)
log_debug ("%s: skipped\n", __func__); log_debug ("%s:%d: skipped\n", __func__, lno);
return 0; return 0;
} }
if (tlv->verbosity > 1) if (tlv->verbosity > 1)
log_debug ("%s: called\n", __func__); log_debug ("%s:%d: called (%p,%zu)\n", __func__, lno,
tlv->buffer, tlv->bufsize);
/* If we are at the end of an ndef container pop the stack. */ /* If we are at the end of an ndef container pop the stack. */
if (!tlv->in_ndef && !tlv->bufsize) if (!tlv->in_ndef && !tlv->bufsize)
{ {
if (tlv->verbosity > 1)
for (i=0; i < tlv->stacklen; i++)
log_debug ("%s: stack[%d] (%p,@%zu,%zu) len=%zu (%zu) %s\n",
__func__, i,
tlv->stack[i].buffer,
tlv->stack[i].buffer - tlv->origbuffer,
tlv->stack[i].bufsize,
tlv->stack[i].length,
tlv->stack[i].crammed,
tlv->stack[i].in_ndef? " ndef":"");
do do
err = _tlv_pop (tlv); err = _tlv_pop (tlv);
while (!err && !tlv->in_ndef && !tlv->bufsize); while (!err && !tlv->in_ndef && !tlv->bufsize);
if (err) if (err)
return (tlv->lasterr = err); return (tlv->lasterr = err);
if (tlv->verbosity > 1) if (tlv->verbosity > 1)
log_debug ("%s: container(s) closed due to size\n", __func__); log_debug ("%s: container(s) closed due to size (lvl=%d)\n",
__func__, tlv->stacklen);
} }
again: again:
/* Get the next tag. */ /* Get the next tag. */
err = parse_tag (&tlv->buffer, &tlv->bufsize, &tlv->ti); save_buffer = buffer = tlv->buffer;
save_bufsize = tlv->bufsize;
err = parse_tag (&buffer, &tlv->bufsize, &tlv->ti);
tlv->buffer = (unsigned char *)buffer;
if (err) if (err)
{ {
if (tlv->verbosity > 1) if (tlv->verbosity > 1)
{
log_debug ("%s: reading tag returned err=%d\n", __func__, err); log_debug ("%s: reading tag returned err=%d\n", __func__, err);
log_printhex (save_buffer, save_bufsize > 40? 40: save_bufsize,
"%s: data was\n", __func__);
dump_to_file (tlv->origbuffer, save_buffer - tlv->origbuffer,
"parseerr");
}
return err; return err;
} }
if ( ( (tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OCTET_STRING)
|| ((flag & TLV_PARSER_FLAG_T5793)
&& tlv->ti.class == CLASS_CONTEXT && tlv->ti.tag == 0))
&& tlv->ti.is_constructed && cram_octet_string (tlv, 1))
{
if (tlv->verbosity > 1)
log_debug ("%s: cramming %s\n", __func__,
tlv->ti.tag? "constructed octet strings":"for Mozilla bug");
if (!cram_octet_string (tlv, 0))
return (tlv->lasterr = gpg_error (GPG_ERR_BAD_BER));
}
/* If there is an end tag in an ndef container pop the stack. Also /* If there is an end tag in an ndef container pop the stack. Also
* pop other containers which are fully consumed. */ * pop other containers which are fully consumed. */
if (tlv->in_ndef && (tlv->ti.class == CLASS_UNIVERSAL if (tlv->in_ndef && (tlv->ti.class == CLASS_UNIVERSAL
@ -368,7 +399,8 @@ _tlv_parser_next (tlv_parser_t tlv, int lno)
if (err) if (err)
return (tlv->lasterr = err); return (tlv->lasterr = err);
if (tlv->verbosity > 1) if (tlv->verbosity > 1)
log_debug ("%s: container(s) closed due to end tag\n", __func__); log_debug ("%s: container(s) closed due to end tag (lvl=%d)\n",
__func__, tlv->stacklen);
goto again; goto again;
} }
@ -488,12 +520,13 @@ gpg_error_t
tlv_expect_object (tlv_parser_t tlv, int class, int tag, tlv_expect_object (tlv_parser_t tlv, int class, int tag,
unsigned char const **r_data, size_t *r_datalen) unsigned char const **r_data, size_t *r_datalen)
{ {
gpg_error_t err;
const unsigned char *p; const unsigned char *p;
size_t n; size_t n;
int needpush = 0; int needpush = 0;
tlv->lastfunc = __func__; tlv->lastfunc = __func__;
/* Note that the parser has already crammed the octet strings for a
* [0] to workaround the Mozilla bug. */
if (!(tlv->ti.class == class && tlv->ti.tag == tag)) if (!(tlv->ti.class == class && tlv->ti.tag == tag))
return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ)); return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
p = tlv->buffer; p = tlv->buffer;
@ -506,89 +539,65 @@ tlv_expect_object (tlv_parser_t tlv, int class, int tag,
else if (!tlv->ti.length) else if (!tlv->ti.length)
return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT)); return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
if (class == CLASS_CONTEXT && tag == 0 && tlv->ti.is_constructed if (tlv->verbosity > 1)
&& need_octet_string_cramming (p, n)) log_debug ("%s: %zu@%zu %c len=%zu (%zu) bufsize=%zu of %zu\n",
{ __func__,
char *newbuffer; tlv->origoff, tlv_parser_offset (tlv),
tlv->ti.is_constructed? 'c':'p',
n, tlv->crammed,
tlv->bufsize, tlv->origbufsize);
newbuffer = cram_octet_string (p, n, r_datalen); if (r_data)
if (!newbuffer)
return (tlv->lasterr = gpg_error (GPG_ERR_BAD_BER));
err = register_buffer (tlv, newbuffer);
if (err)
{
xfree (newbuffer);
return (tlv->lasterr = err);
}
*r_data = newbuffer;
}
else
{
*r_data = p; *r_data = p;
*r_datalen = n; if (r_datalen)
} *r_datalen = tlv->crammed? tlv->crammed : n;
if (needpush) if (needpush)
return _tlv_push (tlv); return _tlv_push (tlv);
if (!(tlv->bufsize >= tlv->ti.length)) if (!(tlv->bufsize >= n))
return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT)); return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
tlv->buffer += tlv->ti.length; tlv->buffer += n;
tlv->bufsize -= tlv->ti.length; tlv->bufsize -= n;
tlv->crammed = 0;
return 0; return 0;
} }
/* Expect that the current tag is an object string and store its value /* Expect that the current tag is an object string and store its value
* at (R_DATA,R_DATALEN). Then skip over its value to the next tag. * at (R_DATA,R_DATALEN). Then skip over its value to the next tag.
* Note that the stored value are not allocated but point into TLV. * Note that the stored value are not allocated but point into TLV. */
* If ENCAPSULATES is set the octet string is used as a new
* container. R_DATA and R_DATALEN are optional. */
gpg_error_t gpg_error_t
tlv_expect_octet_string (tlv_parser_t tlv, int encapsulates, tlv_expect_octet_string (tlv_parser_t tlv,
unsigned char const **r_data, size_t *r_datalen) unsigned char const **r_data, size_t *r_datalen)
{ {
gpg_error_t err;
const unsigned char *p;
size_t n; size_t n;
tlv->lastfunc = __func__; tlv->lastfunc = __func__;
if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OCTET_STRING /* The parser has already crammed constructed octet strings. */
&& (!tlv->ti.is_constructed || encapsulates))) if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OCTET_STRING))
return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ)); return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
p = tlv->buffer; if (!(n=tlv->ti.length) || tlv->ti.ndef )
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 (tlv->verbosity > 1)
&& need_octet_string_cramming (p, n)) log_debug ("%s: %zu@%zu %c len=%zu (%zu) bufsize=%zu of %zu\n",
{ __func__,
char *newbuffer; tlv->origoff, tlv_parser_offset (tlv),
tlv->ti.is_constructed? 'c':'p',
n, tlv->crammed,
tlv->bufsize, tlv->origbufsize);
newbuffer = cram_octet_string (p, n, r_datalen);
if (!newbuffer)
return (tlv->lasterr = gpg_error (GPG_ERR_BAD_BER));
err = register_buffer (tlv, newbuffer);
if (err)
{
xfree (newbuffer);
return (tlv->lasterr = err);
}
*r_data = newbuffer;
}
else
{
if (r_data) if (r_data)
*r_data = p; *r_data = tlv->buffer;
if (r_datalen) if (r_datalen)
*r_datalen = tlv->ti.length; *r_datalen = tlv->crammed? tlv->crammed : tlv->ti.length;
}
if (encapsulates)
return _tlv_push (tlv);
if (!(tlv->bufsize >= tlv->ti.length)) if (!(tlv->bufsize >= tlv->ti.length))
return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT)); return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
tlv->buffer += tlv->ti.length; tlv->buffer += tlv->ti.length;
tlv->bufsize -= tlv->ti.length; tlv->bufsize -= tlv->ti.length;
tlv->crammed = 0;
return 0; return 0;
} }
@ -692,10 +701,26 @@ tlv_expect_object_id (tlv_parser_t tlv,
} }
/* Given an ASN.1 chunk of a structure like: /* Expect a NULL tag. */
gpg_error_t
tlv_expect_null (tlv_parser_t tlv)
{
tlv->lastfunc = __func__;
if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_NULL
&& !tlv->ti.is_constructed && !tlv->ti.length))
return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
return 0;
}
/* Given a BER encoded constructed octet string like the example below
* from Mozilla Firefox 1.0.4 (which actually exports certs as single
* byte chunks of octet strings) in the buffer described by TLV.
* Although the example uses an ndef for the length of the constructed
* octet string, a fixed length is also allowed.
* *
* 24 NDEF: OCTET STRING -- This is not passed to us * 24 NDEF: OCTET STRING
* 04 1: OCTET STRING -- INPUT point s to here * 04 1: OCTET STRING -- TLV->buffer points to here
* : 30 * : 30
* 04 1: OCTET STRING * 04 1: OCTET STRING
* : 80 * : 80
@ -705,84 +730,98 @@ tlv_expect_object_id (tlv_parser_t tlv,
* : } -- This denotes a Null tag and are the last * : } -- This denotes a Null tag and are the last
* -- two bytes in INPUT. * -- two bytes in INPUT.
* *
* The example is from Mozilla Firefox 1.0.4 which actually exports * Turn it into a primitive octet string of this form:
* certs as single byte chunks of octet strings.
* *
* Create a new buffer with the content of that octet string. INPUT * 24 2: OCTET STRING
* is the original buffer with a LENGTH. Returns * : 30 80
* NULL on error or a new malloced buffer with its actual used length *
* stored at R_NEWLENGTH. */ * and fill it up with FE to the original length. Unless TESTMODE is
static unsigned char * * true the TLV object including the the member and the data is
cram_octet_string (const unsigned char *input, size_t length, * adjusted accordingly; however the intiial tag is not changed (in
size_t *r_newlength) * the example the "24 NDEF") because this is not needed anymore.
*
* On error 0 is returned and in this case the buffer might have
* already been modified and thus the caller should better stop
* parsing - unless TESTMODE was used. */
static size_t
cram_octet_string (tlv_parser_t tlv, int testmode)
{ {
const unsigned char *s = input; gpg_error_t err;
size_t n = length; size_t totallen; /* Length of the non-crammed octet strings. */
unsigned char *output, *d; size_t crammedlen; /* Length of the crammed octet strings. */
const unsigned char *s, *save_s;
unsigned char *d;
size_t n, save_n;
struct tag_info ti; struct tag_info ti;
/* Allocate output buf. We know that it won't be longer than the if (tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OCTET_STRING)
input buffer. */ ; /* Okay. */
d = output = xtrymalloc (length); else if (tlv->ti.class == CLASS_CONTEXT && tlv->ti.tag == 0)
if (!output) ; /* Workaround for Mozilla bug; see T5793 */
goto bailout; else
return 0; /* Oops - we should not have been called. */
if (!tlv->ti.is_constructed)
return 0; /* Oops - Not a constructed octet string. */
if (!tlv->ti.ndef && tlv->ti.length < 4)
return 0; /* Fixed length but too short. */
/* Let S point to the first octet string chunk. */
s = tlv->buffer;
n = tlv->ti.ndef? tlv->bufsize : tlv->ti.length;
d = (unsigned char *)s;
totallen = crammedlen = 0;
while (n) while (n)
{ {
if (parse_tag (&s, &n, &ti)) save_s = s;
goto bailout; save_n = n;
if ((err=parse_tag (&s, &n, &ti)))
{
if (tlv->verbosity > 1)
{
log_debug ("%s: parse_tag(n=%zu) failed : %s\n",
__func__, save_n, gpg_strerror (err));
log_printhex (save_s, save_n > 40? 40:save_n, "%s: data was",
__func__);
}
return 0;
}
if (tlv->verbosity > 1)
log_debug ("%s:%s ti.ndef=%d ti.tag=%lu ti.length=%zu (n %zu->%zu)\n",
__func__, testmode?"test:":"",
ti.ndef, ti.tag, ti.length, save_n, n);
if (ti.class == CLASS_UNIVERSAL && ti.tag == TAG_OCTET_STRING if (ti.class == CLASS_UNIVERSAL && ti.tag == TAG_OCTET_STRING
&& !ti.ndef && !ti.is_constructed) && !ti.ndef && !ti.is_constructed)
{ {
memcpy (d, s, ti.length); if (!testmode)
s += ti.length; memmove (d, s, ti.length);
d += ti.length; d += ti.length; /* Update destination */
totallen += ti.length + ti.nhdr;
crammedlen += ti.length;
s += ti.length; /* Skip to next tag. */
n -= ti.length; n -= ti.length;
} }
else if (ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed) else if (ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed)
break; /* Ready */ {
totallen += ti.nhdr;
break; /* EOC - Ready */
}
else else
goto bailout; return 0; /* Invalid data. */
} }
if (!testmode)
*r_newlength = d - output;
return output;
bailout:
xfree (output);
return NULL;
}
/* Return true if (INPUT,LENGTH) is a structure which should be passed
* to cram_octet_string. This is basically the same loop as in
* cram_octet_string but without any actual copying. */
static int
need_octet_string_cramming (const unsigned char *input, size_t length)
{ {
const unsigned char *s = input; memset (d, '\xfe', totallen - crammedlen);
size_t n = length; tlv->ti.length = totallen;
struct tag_info ti; tlv->ti.is_constructed = 0;
tlv->ti.ndef = 0;
if (!length) tlv->crammed = crammedlen;
return 0; if (tlv->verbosity > 1)
while (n)
{ {
if (parse_tag (&s, &n, &ti)) log_debug ("%s: crammed length is %zu\n", __func__, crammedlen);
return 0; log_debug ("%s: total length is %zu\n", __func__, totallen);
if (ti.class == CLASS_UNIVERSAL && ti.tag == TAG_OCTET_STRING
&& !ti.ndef && !ti.is_constructed)
{
s += ti.length;
n -= ti.length;
} }
else if (ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed) dump_to_file (tlv->buffer, totallen, "crammed");
break; /* Ready */
else
return 0;
} }
return totallen;
return 1;
} }

22
common/tlv.h
View File

@ -150,18 +150,17 @@ size_t get_tlv_length (int class, int tag, int constructed, size_t length);
/*-- tlv-parser.c --*/ /*-- tlv-parser.c --*/
#define TLV_PARSER_FLAG_T5793 1 /* Enable workaround for Mozilla bug. */
tlv_parser_t tlv_parser_new (const unsigned char *buffer, size_t bufsize, tlv_parser_t _tlv_parser_new (const unsigned char *buffer, size_t bufsize,
int verbosity); int verbosity, tlv_parser_t lasttlv, int lno);
void tlv_parser_release (tlv_parser_t tlv); tlv_parser_t _tlv_parser_release (tlv_parser_t tlv, int lno);
void _tlv_parser_dump_tag (const char *text, int lno, tlv_parser_t tlv); void _tlv_parser_dump_tag (const char *text, int lno, tlv_parser_t tlv);
void _tlv_parser_dump_state (const char *text, const char *text2, void _tlv_parser_dump_state (const char *text, const char *text2,
int lno, tlv_parser_t tlv); int lno, tlv_parser_t tlv);
int _tlv_parser_peek (tlv_parser_t tlv, int class, int tag); gpg_error_t _tlv_parser_next (tlv_parser_t tlv, unsigned int flags, int lno);
int _tlv_parser_peek_null (tlv_parser_t tlv);
gpg_error_t _tlv_parser_next (tlv_parser_t tlv, int lno);
unsigned int tlv_parser_level (tlv_parser_t tlv); unsigned int tlv_parser_level (tlv_parser_t tlv);
size_t tlv_parser_offset (tlv_parser_t tlv); size_t tlv_parser_offset (tlv_parser_t tlv);
@ -178,7 +177,7 @@ gpg_error_t tlv_expect_set (tlv_parser_t tlv);
gpg_error_t tlv_expect_object (tlv_parser_t tlv, int class, int tag, gpg_error_t tlv_expect_object (tlv_parser_t tlv, int class, int tag,
unsigned char const **r_data, unsigned char const **r_data,
size_t *r_datalen); size_t *r_datalen);
gpg_error_t tlv_expect_octet_string (tlv_parser_t tlv, int encapsulates, gpg_error_t tlv_expect_octet_string (tlv_parser_t tlv,
unsigned char const **r_data, unsigned char const **r_data,
size_t *r_datalen); size_t *r_datalen);
gpg_error_t tlv_expect_integer (tlv_parser_t tlv, int *r_value); gpg_error_t tlv_expect_integer (tlv_parser_t tlv, int *r_value);
@ -189,19 +188,20 @@ gpg_error_t tlv_expect_mpinteger (tlv_parser_t tlv, int ignore_zero,
gpg_error_t tlv_expect_object_id (tlv_parser_t tlv, gpg_error_t tlv_expect_object_id (tlv_parser_t tlv,
unsigned char const **r_oid, unsigned char const **r_oid,
size_t *r_oidlen); size_t *r_oidlen);
gpg_error_t tlv_expect_null (tlv_parser_t tlv);
/* Easier to use wrapper around parse_ber_header. */ /* Easier to use wrapper around parse_ber_header. */
gpg_error_t tlv_parse_tag (unsigned char const **buffer, gpg_error_t tlv_parse_tag (unsigned char const **buffer,
size_t *size, struct tag_info *ti); size_t *size, struct tag_info *ti);
/* Convenience macro and macros to include the line number. */ /* Convenience macro and macros to include the line number. */
#define tlv_parser_new(a,b,c,d) _tlv_parser_new ((a),(b),(c),(d), __LINE__)
#define tlv_parser_release(a) _tlv_parser_release ((a), __LINE__)
#define tlv_parser_dump_tag(a,b) _tlv_parser_dump_tag ((a),__LINE__,(b)) #define tlv_parser_dump_tag(a,b) _tlv_parser_dump_tag ((a),__LINE__,(b))
#define tlv_parser_dump_state(a,b,c) \ #define tlv_parser_dump_state(a,b,c) \
_tlv_parser_dump_state ((a),(b),__LINE__,(c)) _tlv_parser_dump_state ((a),(b),__LINE__,(c))
#define tlv_peek(a,b,c) _tlv_parser_peek ((a),(b),(c)) #define tlv_next(a) _tlv_parser_next ((a),0, __LINE__)
#define tlv_peek_null(a) _tlv_parser_peek_null ((a)) #define tlv_next_with_flag(a,b) _tlv_parser_next ((a),(b), __LINE__)
#define tlv_next(a) _tlv_parser_next ((a), __LINE__)
#endif /* SCD_TLV_H */ #endif /* SCD_TLV_H */

247
sm/minip12.c
View File

@ -1,7 +1,7 @@
/* minip12.c - A minimal pkcs-12 implementation. /* minip12.c - A minimal pkcs-12 implementation.
* Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc. * Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
* Copyright (C) 2014 Werner Koch * Copyright (C) 2014 Werner Koch
* Copyright (C) 2022, 2023 g10 Code GmbH * Copyright (C) 2022-2024 g10 Code GmbH
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -50,9 +50,6 @@
#define DIM(v) (sizeof(v)/sizeof((v)[0])) #define DIM(v) (sizeof(v)/sizeof((v)[0]))
#endif #endif
/* Enable the next macro to dump stuff for debugging. */
#undef ENABLE_DER_STRUCT_DUMPING
static unsigned char const oid_data[9] = { static unsigned char const oid_data[9] = {
0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x01 }; 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x01 };
@ -189,6 +186,25 @@ p12_set_verbosity (int verbose, int debug)
} }
static void
dump_to_file (const void *s, size_t n, const char *name)
{
FILE *fp;
char fname[100];
static int fcount;
if (opt_verbose > 1 && getenv ("GPGSM_DUMP_P12_DATA"))
{
snprintf (fname, sizeof fname, "tmp-p12-%03d-%s", ++fcount, name);
log_debug ("dumping %zu bytes to '%s'\n", n, fname);
fp = fopen (fname, "wb");
if (!fp || fwrite (s, n, 1, fp) != 1)
log_assert (!"fopen or fwrite failed");
fclose (fp);
}
}
static int static int
digest_algo_from_oid (unsigned char const *oid, size_t oidlen) digest_algo_from_oid (unsigned char const *oid, size_t oidlen)
{ {
@ -608,6 +624,7 @@ decrypt_block (const void *ciphertext, unsigned char *plaintext, size_t length,
memcpy (plaintext, ciphertext, length); memcpy (plaintext, ciphertext, length);
crypt_block (plaintext, length, salt, saltlen, iter, iv, ivlen, crypt_block (plaintext, length, salt, saltlen, iter, iv, ivlen,
convertedpw? convertedpw:pw, cipher_algo, digest_algo, 0); convertedpw? convertedpw:pw, cipher_algo, digest_algo, 0);
dump_to_file (plaintext, length, "raw-decrypt");
if (check_fnc (plaintext, length)) if (check_fnc (plaintext, length))
{ {
/* Strip the pkcs#7 padding. */ /* Strip the pkcs#7 padding. */
@ -646,15 +663,7 @@ bag_decrypted_data_p (const void *plaintext, size_t length)
const unsigned char *p = plaintext; const unsigned char *p = plaintext;
size_t n = length; size_t n = length;
#ifdef ENABLE_DER_STRUCT_DUMPING dump_to_file (p, n, "plain-data.der");
{
# warning debug code is enabled
FILE *fp = fopen ("tmp-minip12-plain-data.der", "wb");
if (!fp || fwrite (p, n, 1, fp) != 1)
exit (2);
fclose (fp);
}
#endif /*ENABLE_DER_STRUCT_DUMPING*/
if (tlv_parse_tag (&p, &n, &ti)) if (tlv_parse_tag (&p, &n, &ti))
return 0; return 0;
@ -686,7 +695,8 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
int is_pbes2 = 0; int is_pbes2 = 0;
int is_aes256 = 0; int is_aes256 = 0;
int keyelem_count; int keyelem_count;
int renewed_tlv = 0; tlv_parser_t tmptlv;
int newtlv = 0;
int loopcount; int loopcount;
unsigned int startlevel, startlevel2; unsigned int startlevel, startlevel2;
int digest_algo = GCRY_MD_SHA1; int digest_algo = GCRY_MD_SHA1;
@ -791,7 +801,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
parmlen -= tlv_parser_tag_length (tlv, 1); parmlen -= tlv_parser_tag_length (tlv, 1);
if (datalen < 8 || datalen > sizeof salt) if (datalen < 8 || datalen > sizeof salt)
@ -835,12 +845,13 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("kdf digest algo = %d\n", digest_algo); log_debug ("kdf digest algo = %d\n", digest_algo);
if (tlv_peek_null (tlv))
{
/* Read the optional Null tag. */ /* Read the optional Null tag. */
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
} else if (!tlv_expect_null (tlv))
; /* NULL tag needs no skip. */
else
tlv_parser_set_pending (tlv);
} }
else else
digest_algo = GCRY_MD_SHA1; digest_algo = GCRY_MD_SHA1;
@ -870,7 +881,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (datalen != sizeof iv) if (datalen != sizeof iv)
{ {
@ -889,7 +900,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (datalen < 8 || datalen > 20) if (datalen < 8 || datalen > 20)
{ {
@ -913,11 +924,12 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
} }
where = "rc2or3desoraes-ciphertext"; where = "rc2or3desoraes-ciphertext";
if (tlv_next (tlv)) if (tlv_next_with_flag (tlv, TLV_PARSER_FLAG_T5793))
goto bailout; goto bailout;
if (tlv_expect_object (tlv, CLASS_CONTEXT, 0, &data, &datalen)) if (tlv_expect_object (tlv, CLASS_CONTEXT, 0, &data, &datalen))
goto bailout; goto bailout;
dump_to_file (data, datalen, "raw-ciphertext");
if (opt_verbose) if (opt_verbose)
log_info ("%zu bytes of %s encrypted text\n", datalen, log_info ("%zu bytes of %s encrypted text\n", datalen,
@ -945,13 +957,14 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
/* We do not need the TLV anymore and allocated a new one. */ /* We do not need the TLV anymore and allocated a new one. */
where = "bag.encryptedData.decrypted-text"; where = "bag.encryptedData.decrypted-text";
tlv = tlv_parser_new (plain, datalen, opt_verbose); tmptlv = tlv_parser_new (plain, datalen, opt_verbose, tlv);
if (!tlv) if (!tmptlv)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto bailout; goto bailout;
} }
renewed_tlv = 1; tlv = tmptlv;
newtlv = 1;
if (tlv_next (tlv)) if (tlv_next (tlv))
{ {
@ -1056,7 +1069,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
/* We ignore the next octet string. */ /* We ignore the next octet string. */
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (tlv_next (tlv)) if (tlv_next (tlv))
@ -1144,7 +1157,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
/* Return the certificate. */ /* Return the certificate. */
@ -1154,17 +1167,19 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
/* Skip the optional SET with the pkcs12 cert attributes. */ /* Skip the optional SET with the pkcs12 cert attributes. */
where = "bag.attribute_set"; where = "bag.attribute_set";
if (tlv_peek (tlv, CLASS_UNIVERSAL, TAG_SET)) err = tlv_next (tlv);
if (err && gpg_err_code (err) == GPG_ERR_EOF)
err = 0;
else if (err)
goto bailout;
else if (!tlv_expect_set (tlv))
{ {
if (tlv_next (tlv))
goto bailout;
err = tlv_expect_set (tlv);
if (err)
goto bailout;
tlv_parser_skip (tlv); tlv_parser_skip (tlv);
if (opt_verbose) if (opt_verbose)
log_info ("skipping %s\n", where); log_info ("skipping %s\n", where);
} }
else
tlv_parser_set_pending (tlv);
} }
if (!err) if (!err)
tlv_parser_set_pending (tlv); tlv_parser_set_pending (tlv);
@ -1177,7 +1192,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
err = 0; err = 0;
leave: leave:
if (renewed_tlv) if (newtlv)
tlv_parser_release (tlv); tlv_parser_release (tlv);
gcry_free (plain); gcry_free (plain);
if (ctx->badpass) if (ctx->badpass)
@ -1211,15 +1226,7 @@ bag_data_p (const void *plaintext, size_t length)
const unsigned char *p = plaintext; const unsigned char *p = plaintext;
size_t n = length; size_t n = length;
#ifdef ENABLE_DER_STRUCT_DUMPING dump_to_file (p, n, "plain-key.der");
{
# warning debug code is enabled
FILE *fp = fopen ("tmp-minip12-plain-key.der", "wb");
if (!fp || fwrite (p, n, 1, fp) != 1)
exit (2);
fclose (fp);
}
#endif /*ENABLE_DER_STRUCT_DUMPING*/
if (tlv_parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE) if (tlv_parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
return 0; return 0;
@ -1245,8 +1252,8 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
size_t saltlen; size_t saltlen;
char iv[16]; char iv[16];
unsigned int iter; unsigned int iter;
tlv_parser_t saved_tlv = NULL; tlv_parser_t tmptlv = NULL;
int renewed_tlv = 0; /* True if the TLV must be released. */ int newtlv = 0; /* Counter which is true if the TLV must be released. */
unsigned char *plain = NULL; unsigned char *plain = NULL;
int is_pbes2 = 0; int is_pbes2 = 0;
int is_aes256 = 0; int is_aes256 = 0;
@ -1322,7 +1329,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
parmlen -= tlv_parser_tag_length (tlv, 1); parmlen -= tlv_parser_tag_length (tlv, 1);
if (datalen < 8 || datalen > sizeof salt) if (datalen < 8 || datalen > sizeof salt)
@ -1366,12 +1373,13 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("kdf digest algo = %d\n", digest_algo); log_debug ("kdf digest algo = %d\n", digest_algo);
if (tlv_peek_null (tlv))
{
/* Read the optional Null tag. */ /* Read the optional Null tag. */
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
} else if (!tlv_expect_null (tlv))
; /* NULL tag needs no skip. */
else
tlv_parser_set_pending (tlv);
} }
else else
digest_algo = GCRY_MD_SHA1; digest_algo = GCRY_MD_SHA1;
@ -1400,7 +1408,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (datalen != sizeof iv) if (datalen != sizeof iv)
goto bailout; /* Bad IV. */ goto bailout; /* Bad IV. */
@ -1416,8 +1424,11 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (opt_verbose > 1)
log_printhex (data, datalen, "%s: salt", __func__);
if (datalen < 8 || datalen > 20) if (datalen < 8 || datalen > 20)
{ {
log_info ("bad length of salt (%zu) for 3DES\n", datalen); log_info ("bad length of salt (%zu) for 3DES\n", datalen);
@ -1442,7 +1453,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
where = "shrouded_key_bag.3desoraes-ciphertext"; where = "shrouded_key_bag.3desoraes-ciphertext";
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (opt_verbose) if (opt_verbose)
@ -1472,14 +1483,14 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
/* We do not need the TLV anymore and allocated a new one. */ /* We do not need the TLV anymore and allocated a new one. */
where = "shrouded_key_bag.decrypted-text"; where = "shrouded_key_bag.decrypted-text";
saved_tlv = tlv; tmptlv = tlv_parser_new (plain, datalen, opt_verbose, tlv);
tlv = tlv_parser_new (plain, datalen, opt_verbose); if (!tmptlv)
if (!tlv)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto bailout; goto bailout;
} }
renewed_tlv = 1; tlv = tmptlv;
newtlv++;
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("new parser context\n"); log_debug ("new parser context\n");
@ -1526,12 +1537,13 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("RSA parameters\n"); log_debug ("RSA parameters\n");
if (tlv_peek_null (tlv))
{
/* Read the optional Null tag. */ /* Read the optional Null tag. */
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
} else if (!tlv_expect_null (tlv))
; /* NULL tag needs no skip. */
else
tlv_parser_set_pending (tlv);
} }
else if (oidlen == DIM(oid_pcPublicKey) else if (oidlen == DIM(oid_pcPublicKey)
&& !memcmp (oid, oid_pcPublicKey, oidlen)) && !memcmp (oid, oid_pcPublicKey, oidlen))
@ -1561,9 +1573,21 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
/* An octet string to encapsulate the key elements. */ /* An octet string to encapsulate the key elements. */
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 1, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
tmptlv = tlv_parser_new (data, datalen, opt_verbose, tlv);
if (!tmptlv)
{
err = gpg_error_from_syserror ();
goto bailout;
}
tlv = tmptlv;
newtlv++;
data = NULL;
if (opt_verbose > 1)
log_debug ("new parser context\n");
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_sequence (tlv)) if (tlv_expect_sequence (tlv))
@ -1572,7 +1596,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (ctx->privatekey2) if (ctx->privatekey2)
{ {
err = gpg_error (GPG_ERR_DUP_VALUE); err = gpg_error (GPG_ERR_DUP_VALUE);
log_error ("two private kesy have already been received\n"); log_error ("two private keys have already been received\n");
goto bailout; goto bailout;
} }
privatekey = gcry_calloc (10, sizeof *privatekey); privatekey = gcry_calloc (10, sizeof *privatekey);
@ -1607,7 +1631,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (opt_verbose > 1) if (opt_verbose > 1)
log_printhex (data, datalen, "ecc q="); log_printhex (data, datalen, "ecc q=");
@ -1660,30 +1684,33 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("restoring parser context\n"); log_debug ("restoring parser context\n");
tlv_parser_release (tlv); tlv = tlv_parser_release (tlv);
renewed_tlv = 0; log_assert (tlv);
tlv = saved_tlv; newtlv--;
where = "shrouded_key_bag.attribute_set"; where = "shrouded_key_bag.attribute_set";
/* Check for an optional set of attributes. */ /* Check for an optional set of attributes. */
if (tlv_peek (tlv, CLASS_UNIVERSAL, TAG_SET)) err = tlv_next (tlv);
if (err && gpg_err_code (err) == GPG_ERR_EOF)
err = 0;
else if (err)
goto bailout;
else if (!tlv_expect_set (tlv))
{ {
if (tlv_next (tlv))
goto bailout;
err = tlv_expect_set (tlv);
if (err)
goto bailout;
tlv_parser_skip (tlv); tlv_parser_skip (tlv);
if (opt_verbose) if (opt_verbose)
log_info ("skipping %s\n", where); log_info ("skipping %s\n", where);
} }
else
tlv_parser_set_pending (tlv);
leave: leave:
gcry_free (plain); gcry_free (plain);
if (renewed_tlv) while (newtlv)
{ {
tlv_parser_release (tlv); tlv = tlv_parser_release (tlv);
newtlv--;
if (opt_verbose > 1) if (opt_verbose > 1)
log_debug ("parser context released\n"); log_debug ("parser context released\n");
} }
@ -1758,7 +1785,7 @@ parse_cert_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 0, &data, &datalen)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
/* Return the certificate from the octet string. */ /* Return the certificate from the octet string. */
@ -1771,18 +1798,19 @@ parse_cert_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
*/ */
where = "certbag.attribute_set"; where = "certbag.attribute_set";
/* Check for an optional set of attributes. */ /* Check for an optional set of attributes. */
if (tlv_peek (tlv, CLASS_UNIVERSAL, TAG_SET)) err = tlv_next (tlv);
if (err && gpg_err_code (err) == GPG_ERR_EOF)
err = 0;
else if (err)
goto bailout;
else if (!tlv_expect_set (tlv))
{ {
if (tlv_next (tlv))
goto bailout;
err = tlv_expect_set (tlv);
if (err)
goto bailout;
tlv_parser_skip (tlv); tlv_parser_skip (tlv);
if (opt_verbose) if (opt_verbose)
log_info ("skipping %s\n", where); log_info ("skipping %s\n", where);
} }
else
tlv_parser_set_pending (tlv);
leave: leave:
return err; return err;
@ -1809,6 +1837,10 @@ parse_bag_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
const unsigned char *oid; const unsigned char *oid;
size_t oidlen; size_t oidlen;
unsigned int startlevel; unsigned int startlevel;
const unsigned char *data;
size_t datalen;
tlv_parser_t tmptlv;
int newtlv = 0; /* True if the TLV must be released. */
if (opt_verbose) if (opt_verbose)
log_info ("processing bag data\n"); log_info ("processing bag data\n");
@ -1825,17 +1857,20 @@ parse_bag_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
if (tlv_next (tlv)) if (tlv_next (tlv))
goto bailout; goto bailout;
if (tlv_expect_octet_string (tlv, 1, NULL, NULL)) if (tlv_expect_octet_string (tlv, &data, &datalen))
goto bailout; goto bailout;
if (tlv_peek (tlv, CLASS_UNIVERSAL, TAG_OCTET_STRING)) tmptlv = tlv_parser_new (data, datalen, opt_verbose, tlv);
if (!tmptlv)
{ {
if (tlv_next (tlv)) err = gpg_error_from_syserror ();
goto bailout;
err = tlv_expect_octet_string (tlv, 1, NULL, NULL);
if (err)
goto bailout; goto bailout;
} }
tlv = tmptlv;
newtlv = 1;
data = NULL;
if (opt_verbose > 1)
log_debug ("new parser context for embedded octet string\n");
/* Expect: /* Expect:
* SEQUENCE * SEQUENCE
@ -1894,6 +1929,12 @@ parse_bag_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
err = 0; err = 0;
leave: leave:
if (newtlv)
{
tlv_parser_release (tlv);
if (opt_verbose > 1)
log_debug ("parser context released\n");
}
return err; return err;
bailout: bailout:
@ -1930,6 +1971,10 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
int intval; int intval;
unsigned int startlevel; unsigned int startlevel;
int i; int i;
const unsigned char *data;
size_t datalen;
tlv_parser_t tmptlv;
int newtlv = 0; /* True if the TLV must be released. */
*r_badpass = 0; *r_badpass = 0;
@ -1937,7 +1982,7 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
ctx.certcbarg = certcbarg; ctx.certcbarg = certcbarg;
ctx.password = pw; ctx.password = pw;
tlv = tlv_parser_new (buffer, length, opt_verbose); tlv = tlv_parser_new (buffer, length, opt_verbose, 0);
if (!tlv) if (!tlv)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
@ -1979,17 +2024,21 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
if ((err = tlv_next (tlv))) if ((err = tlv_next (tlv)))
goto bailout; goto bailout;
if ((err = tlv_expect_octet_string (tlv, 1, NULL, NULL))) if ((err = tlv_expect_octet_string (tlv, &data, &datalen)))
goto bailout; goto bailout;
if (tlv_peek (tlv, CLASS_UNIVERSAL, TAG_OCTET_STRING)) tmptlv = tlv_parser_new (data, datalen, opt_verbose, NULL);
if (!tmptlv)
{ {
if ((err = tlv_next (tlv))) err = gpg_error_from_syserror ();
goto bailout;
err = tlv_expect_octet_string (tlv, 1, NULL, NULL);
if (err)
goto bailout; goto bailout;
} }
tlv = tmptlv;
newtlv = 1;
data = NULL;
if (opt_verbose > 1)
log_debug ("new parser context for embedded octet string\n");
where = "bags"; where = "bags";
if ((err = tlv_next (tlv))) if ((err = tlv_next (tlv)))
@ -2046,6 +2095,12 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
goto bailout; goto bailout;
err = 0; err = 0;
if (newtlv)
{
tlv = tlv_parser_release (tlv);
if (opt_verbose > 1)
log_debug ("parser context released\n");
}
tlv_parser_release (tlv); tlv_parser_release (tlv);
if (r_curve) if (r_curve)
*r_curve = ctx.curve; *r_curve = ctx.curve;
@ -2064,6 +2119,12 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
return ctx.privatekey; return ctx.privatekey;
bailout: bailout:
if (newtlv)
{
tlv = tlv_parser_release (tlv);
if (opt_verbose > 1)
log_debug ("parser context released\n");
}
*r_badpass = ctx.badpass; *r_badpass = ctx.badpass;
log_error ("%s(%s): @%04zu lvl=%u %s: %s - %s\n", log_error ("%s(%s): @%04zu lvl=%u %s: %s - %s\n",
__func__, where, __func__, where,