projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
About log system changes
[yaz-moved-to-github.git]
/
src
/
ber_oid.c
diff --git
a/src/ber_oid.c
b/src/ber_oid.c
index
276b49b
..
eba9ce6
100644
(file)
--- a/
src/ber_oid.c
+++ b/
src/ber_oid.c
@@
-1,9
+1,16
@@
/*
/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
*
- * $Id: ber_oid.c,v 1.1 2003-10-27 12:21:30 adam Exp $
+ * $Id: ber_oid.c,v 1.4 2004-10-15 00:18:59 adam Exp $
+ */
+
+/**
+ * \file ber_oid.c
+ * \brief Implements BER OID encoding and decoding
+ *
+ * This source file implements BER encoding and decoding of
+ * the OID type.
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-25,32
+32,21
@@
int ber_oidc(ODR o, Odr_oid *p)
odr_seterror(o, OPROTO, 18);
return 0;
}
odr_seterror(o, OPROTO, 18);
return 0;
}
- if (len < 0)
+ if (len <= 0)
{
odr_seterror(o, OPROTO, 19);
return 0;
}
o->bp += res;
{
odr_seterror(o, OPROTO, 19);
return 0;
}
o->bp += res;
- if (len == 0)
- {
- *p = -1;
- return 1;
- }
if (len > odr_max(o))
{
odr_seterror(o, OPROTO, 20);
return 0;
}
if (len > odr_max(o))
{
odr_seterror(o, OPROTO, 20);
return 0;
}
- p[0] = *o->bp / 40;
- if (p[0] > 2)
- p[0] = 2;
- p[1] = *o->bp - p[0] * 40;
- o->bp++;
- pos = 2;
- len--;
- while (len)
- {
- p[pos] = 0;
+ pos = 0;
+ while (len)
+ {
+ int id = 0;
do
{
if (!len)
do
{
if (!len)
@@
-58,13
+54,22
@@
int ber_oidc(ODR o, Odr_oid *p)
odr_seterror(o, OPROTO, 21);
return 0;
}
odr_seterror(o, OPROTO, 21);
return 0;
}
- p[pos] <<= 7;
- p[pos] |= *o->bp & 0X7F;
+ id <<= 7;
+ id |= *o->bp & 0X7F;
len--;
}
while (*(o->bp++) & 0X80);
len--;
}
while (*(o->bp++) & 0X80);
- pos++;
- }
+ if (pos > 0)
+ p[pos++] = id;
+ else
+ {
+ p[0] = id / 40;
+ if (p[0] > 2)
+ p[0] = 2;
+ p[1] = id - p[0] * 40;
+ pos = 2;
+ }
+ }
p[pos] = -1;
return 1;
case ODR_ENCODE:
p[pos] = -1;
return 1;
case ODR_ENCODE:
@@
-73,15
+78,18
@@
int ber_oidc(ODR o, Odr_oid *p)
lenp = odr_tell(o);
if (odr_putc(o, 0) < 0) /* dummy */
return 0;
lenp = odr_tell(o);
if (odr_putc(o, 0) < 0) /* dummy */
return 0;
- if (p[0] < 0 && p[1] <= 0)
+ if (p[0] < 0 || p[1] < 0)
{
odr_seterror(o, ODATA, 23);
return 0;
}
for (pos = 1; p[pos] >= 0; pos++)
{
{
odr_seterror(o, ODATA, 23);
return 0;
}
for (pos = 1; p[pos] >= 0; pos++)
{
- id = pos > 1 ? p[pos] : p[0] * 40 + p[1];
n = 0;
n = 0;
+ if (pos == 1)
+ id = p[0]*40 + p[1];
+ else
+ id = p[pos];
do
{
octs[n++] = id & 0X7F;
do
{
octs[n++] = id & 0X7F;