* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: ber_tag.c,v 1.24 2003-01-06 08:20:27 adam Exp $
+ * $Id: ber_tag.c,v 1.26 2003-05-20 19:55:29 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
*
* Should perhaps be odr_tag?
*/
-int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt)
+int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
+ const char *name)
{
struct Odr_ber_tag *odr_ber_tag = &o->op->odr_ber_tag;
int rd;
if (!*pp)
{
if (!opt)
- o->error = OREQUIRED;
+ {
+ odr_seterror(o, OREQUIRED, 24);
+ odr_setaddinfo (o, name);
+ }
return 0;
}
if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
if (o->op->stackp > -1 && !odr_constructed_more(o))
{
if (!opt)
- o->error = OREQUIRED;
+ {
+ odr_seterror(o, OREQUIRED, 25);
+ odr_setaddinfo(o, name);
+ }
return 0;
}
if (odr_ber_tag->lclass < 0)
{
- if ((odr_ber_tag->br = ber_dectag(o->bp, &odr_ber_tag->lclass,
- &odr_ber_tag->ltag, &odr_ber_tag->lcons)) <= 0)
+ if ((odr_ber_tag->br =
+ ber_dectag(o->bp, &odr_ber_tag->lclass,
+ &odr_ber_tag->ltag, &odr_ber_tag->lcons,
+ odr_max(o))) <= 0)
{
- o->error = OPROTO;
+ odr_seterror(o, OPROTO, 26);
+ odr_setaddinfo(o, name);
return 0;
}
#ifdef ODR_DEBUG
else
{
if (!opt)
- o->error = OREQUIRED;
+ {
+ odr_seterror(o, OREQUIRED, 27);
+ odr_setaddinfo(o, name);
+ }
return 0;
}
case ODR_PRINT:
if (!*pp && !opt)
- o->error = OREQUIRED;
+ {
+ odr_seterror(o,OREQUIRED, 28);
+ odr_setaddinfo(o, name);
+ }
return *pp != 0;
default:
- o->error = OOTHER;
+ odr_seterror(o, OOTHER, 29);
+ odr_setaddinfo(o, name);
return 0;
}
}
/* ber_dectag
* Decode BER identifier octets. Return number of bytes read or -1 for error.
*/
-int ber_dectag(const unsigned char *buf, int *zclass, int *tag, int *constructed)
+int ber_dectag(const unsigned char *b, int *zclass, int *tag,
+ int *constructed, int max)
{
- const unsigned char *b = buf;
+ int l = 1;
+
+ if (l > max)
+ return -1;
*zclass = *b >> 6;
*constructed = (*b >> 5) & 0X01;
if ((*tag = *b & 0x1F) <= 30)
return 1;
- b++;
*tag = 0;
do
{
+ if (l >= max)
+ return -1;
*tag <<= 7;
- *tag |= *b & 0X7F;
- if (b - buf >= 5) /* Precaution */
- return -1;
+ *tag |= b[l] & 0X7F;
}
- while (*(b++) & 0X80);
- return b - buf;
+ while (b[l++] & 0X80);
+ return l;
}