/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: ber_tag.c,v $
- * Revision 1.2 1995-02-07 17:52:59 quinn
- * A damn mess, but now things work, I think.
- *
- * Revision 1.1 1995/02/02 16:21:53 quinn
- * First kick.
- *
+ * $Id: ber_tag.c,v 1.27 2003-05-24 19:20:14 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
-#include <odr.h>
+#include "odr-priv.h"
/* ber_tag
* On encoding:
* if p: write tag. return 1 (success) or -1 (error).
* if !p: return 0.
* On decoding:
- * if tag && class match up, advance pointer and return 1. set cons.
+ * if tag && zclass match up, advance pointer and return 1. set cons.
* else leave pointer unchanged. Return 0.
-*/
-int ber_tag(ODR o, const void *p, int class, int tag, int *constructed)
+ *
+ * Should perhaps be odr_tag?
+ */
+int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
+ const char *name)
{
- static int lclass = -1, ltag, br, lcons; /* save t&c rather than
- decoding twice */
+ struct Odr_ber_tag *odr_ber_tag = &o->op->odr_ber_tag;
int rd;
+ char **pp = (char **)p;
+ if (o->direction == ODR_DECODE)
+ *pp = 0;
o->t_class = -1;
+ if (o->op->stackp < 0)
+ {
+ odr_seek(o, ODR_S_SET, 0);
+ o->top = 0;
+ o->bp = o->buf;
+ odr_ber_tag->lclass = -1;
+ }
switch (o->direction)
{
- case ODR_ENCODE:
- if (!p)
- return 0;
- if ((rd = ber_enctag(o->bp, class, tag, *constructed, o->left))
- <=0)
- return -1;
- o->bp += rd;
- o->left -= rd;
- fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", class, tag,
- *constructed);
- return 1;
- case ODR_DECODE:
- if (lclass < 0)
- {
- if ((br = ber_dectag(o->bp, &lclass, <ag, &lcons)) <= 0)
- return -1;
- fprintf(stderr, "\n[class=%d,tag=%d,cons=%d]", lclass, ltag,
- lcons);
- }
- if (class == lclass && tag == ltag)
- {
- o->bp += br;
- o->left -= br;
- *constructed = lcons;
- lclass = -1;
- return 1;
- }
- else
- return 0;
- case ODR_PRINT: return p != 0;
- default: return 0;
+ case ODR_ENCODE:
+ if (!*pp)
+ {
+ if (!opt)
+ {
+ odr_seterror(o, OREQUIRED, 24);
+ odr_setelement (o, name);
+ }
+ return 0;
+ }
+ if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
+ return -1;
+#ifdef ODR_DEBUG
+ fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
+ *constructed, o->stackp);
+#endif
+ return 1;
+
+ case ODR_DECODE:
+ if (o->op->stackp > -1 && !odr_constructed_more(o))
+ {
+ if (!opt)
+ {
+ odr_seterror(o, OREQUIRED, 25);
+ odr_setelement(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,
+ odr_max(o))) <= 0)
+ {
+ odr_seterror(o, OPROTO, 26);
+ odr_setelement(o, name);
+ return 0;
+ }
+#ifdef ODR_DEBUG
+ fprintf(stderr,
+ "\n[class=%d,tag=%d,cons=%d,stackp=%d]",
+ odr_ber_tag->lclass, odr_ber_tag->ltag,
+ odr_ber_tag->lcons, o->stackp);
+#endif
+ }
+ if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
+ {
+ o->bp += odr_ber_tag->br;
+ *constructed = odr_ber_tag->lcons;
+ odr_ber_tag->lclass = -1;
+ return 1;
+ }
+ else
+ {
+ if (!opt)
+ {
+ odr_seterror(o, OREQUIRED, 27);
+ odr_setelement(o, name);
+ }
+ return 0;
+ }
+ case ODR_PRINT:
+ if (!*pp && !opt)
+ {
+ odr_seterror(o,OREQUIRED, 28);
+ odr_setelement(o, name);
+ }
+ return *pp != 0;
+ default:
+ odr_seterror(o, OOTHER, 29);
+ odr_setelement(o, name);
+ return 0;
}
}
/* ber_enctag
- * BER-encode a class/tag/constructed package (identifier octets). Return
+ * BER-encode a zclass/tag/constructed package (identifier octets). Return
* number of bytes encoded, or -1 if out of bounds.
*/
-int ber_enctag(unsigned char *buf, int class, int tag, int constructed, int len)
+int ber_enctag(ODR o, int zclass, int tag, int constructed)
{
int cons = (constructed ? 1 : 0), n = 0;
- unsigned char octs[sizeof(int)], *b = buf;
+ unsigned char octs[sizeof(int)], b;
- *b = (class << 6) & 0XC0;
- *b |= (cons << 5) & 0X20;
+ b = (zclass << 6) & 0XC0;
+ b |= (cons << 5) & 0X20;
if (tag <= 30)
{
- *b |= tag & 0X1F;
+ b |= tag & 0X1F;
+ if (odr_putc(o, b) < 0)
+ return -1;
return 1;
}
else
{
- *(b++) |= 0x1F;
+ b |= 0X1F;
+ if (odr_putc(o, b) < 0)
+ return -1;
do
{
octs[n++] = tag & 0X7F;
tag >>= 7;
- if (n >= len) /* bounds check */
- return -1;
}
while (tag);
while (n--)
- *(b++) = octs[n] | ((n > 0) << 7);
- return b - buf;
+ {
+ unsigned char oo;
+
+ oo = octs[n] | ((n > 0) << 7);
+ if (odr_putc(o, oo) < 0)
+ return -1;
+ }
+ return 0;
}
}
/* ber_dectag
* Decode BER identifier octets. Return number of bytes read or -1 for error.
*/
-int ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed)
+int ber_dectag(const unsigned char *b, int *zclass, int *tag,
+ int *constructed, int max)
{
- unsigned char *b = buf;
+ int l = 1;
+
+ if (l > max)
+ return -1;
- *class = *b >> 6;
+ *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;
}
projects / yaz-moved-to-github.git / blobdiff