mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

POST(p); POST(len);

Browse Source
This commit is contained in:
Mark Andrews
2011-08-29 04:15:50 +00:00
parent 106561b398
commit 07a4f0eace
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/dns/spnego.c
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: spnego.c,v 1.19 2011/08/26 04:42:24 marka Exp $ */ /* $Id: spnego.c,v 1.20 2011/08/29 04:15:50 marka Exp $ */
/*! \file /*! \file
* \brief * \brief
@@ -949,7 +949,8 @@ der_match_tag_and_length(const unsigned char *p, size_t len,
if (e) if (e)
return (e); return (e);
/* p += l; */ /* p += l; */
/* len -= l; */ len -= l;
POST(len);
ret += l; ret += l;
if (size) if (size)
*size = ret; *size = ret;
@@ -978,8 +979,9 @@ decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size)
e = der_get_int(p, reallen, num, &l); e = der_get_int(p, reallen, num, &l);
if (e) if (e)
return (e); return (e);
/* p += l; */ p += l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
if (size) if (size)
*size = ret; *size = ret;
@@ -1006,7 +1008,7 @@ decode_octet_string(const unsigned char *p, size_t len,
if (e) if (e)
return (e); return (e);
p += l; p += l;
/* len -= l; */ len -= l;
ret += l; ret += l;
if (len < slen) if (len < slen)
return (ASN1_OVERRUN); return (ASN1_OVERRUN);
@@ -1014,8 +1016,9 @@ decode_octet_string(const unsigned char *p, size_t len,
e = der_get_octet_string(p, slen, k, &l); e = der_get_octet_string(p, slen, k, &l);
if (e) if (e)
return (e); return (e);
/* p += l; */ p += l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
if (size) if (size)
*size = ret; *size = ret;
@@ -1050,8 +1053,9 @@ decode_oid(const unsigned char *p, size_t len,
e = der_get_oid(p, slen, k, &l); e = der_get_oid(p, slen, k, &l);
if (e) if (e)
return (e); return (e);
/* p += l; */ p += l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
if (size) if (size)
*size = ret; *size = ret;
@@ -1198,6 +1202,7 @@ der_put_octet_string(unsigned char *p, size_t len,
return (ASN1_OVERFLOW); return (ASN1_OVERFLOW);
p -= data->length; p -= data->length;
len -= data->length; len -= data->length;
POST(len);
memcpy(p + 1, data->data, data->length); memcpy(p + 1, data->data, data->length);
*size = data->length; *size = data->length;
return (0); return (0);
@@ -1261,8 +1266,9 @@ der_put_length_and_tag(unsigned char *p, size_t len, size_t len_val,
e = der_put_tag(p, len, class, type, tag, &l); e = der_put_tag(p, len, class, type, tag, &l);
if (e) if (e)
return (e); return (e);
/* p -= l; */ p -= l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
*size = ret; *size = ret;
return (0); return (0);
@@ -1285,8 +1291,9 @@ encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *size)
e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_Enumerated, &l); e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_Enumerated, &l);
if (e) if (e)
return (e); return (e);
/* p -= l; */ p -= l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
*size = ret; *size = ret;
return (0); return (0);
@@ -1309,8 +1316,9 @@ encode_octet_string(unsigned char *p, size_t len,
e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_OctetString, &l); e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_OctetString, &l);
if (e) if (e)
return (e); return (e);
/* p -= l; */ p -= l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
*size = ret; *size = ret;
return (0); return (0);
@@ -1333,8 +1341,9 @@ encode_oid(unsigned char *p, size_t len,
e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_OID, &l); e = der_put_length_and_tag(p, len, l, ASN1_C_UNIV, PRIM, UT_OID, &l);
if (e) if (e)
return (e); return (e);
/* p -= l; */ p -= l;
/* len -= l; */ len -= l;
POST(p); POST(len);
ret += l; ret += l;
*size = ret; *size = ret;
return (0); return (0);