X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fdecode.c;h=ca24e89c3887ce58416fd44c5863d51a674ecd55;hb=8045b54124f0365b3d34d9d3220256f052f2b76b;hp=f41966297f3c7fc58db6525867115473fc63138b;hpb=1bcec8bf6a17a65396b2c947faed846d20428db9;p=openldap diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c index f41966297f..ca24e89c38 100644 --- a/libraries/liblber/decode.c +++ b/libraries/liblber/decode.c @@ -1,6 +1,7 @@ /* decode.c - ber input decoding routines */ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Portions @@ -18,24 +19,26 @@ #include "portable.h" #include -#include -#include +#include +#include #include #include #include "lber-int.h" -static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len )); +static ber_len_t ber_getnint LDAP_P(( + BerElement *ber, + ber_int_t *num, + ber_len_t len )); /* return the tag - LBER_DEFAULT returned means trouble */ -unsigned long +ber_tag_t ber_get_tag( BerElement *ber ) { unsigned char xbyte; - unsigned long tag; - char *tagp; + ber_tag_t tag; unsigned int i; assert( ber != NULL ); @@ -44,37 +47,36 @@ ber_get_tag( BerElement *ber ) if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) return( LBER_DEFAULT ); + tag = xbyte; + if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) - return( (unsigned long) xbyte ); + return tag; - tagp = (char *) &tag; - tagp[0] = xbyte; - for ( i = 1; i < sizeof(long); i++ ) { + for ( i = 1; i < sizeof(ber_tag_t); i++ ) { if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) return( LBER_DEFAULT ); - tagp[i] = xbyte; + tag <<= 8; + tag |= 0x00ffUL & (ber_tag_t) xbyte; if ( ! (xbyte & LBER_MORE_TAG_MASK) ) break; } /* tag too big! */ - if ( i == sizeof(long) ) + if ( i == sizeof(ber_tag_t) ) return( LBER_DEFAULT ); - /* want leading, not trailing 0's */ - return( tag >> (sizeof(long) - i - 1) ); + return tag; } -unsigned long -ber_skip_tag( BerElement *ber, unsigned long *len ) +ber_tag_t +ber_skip_tag( BerElement *ber, ber_len_t *len ) { - unsigned long tag; + ber_tag_t tag; unsigned char lc; - unsigned int noctets; - int diff; - unsigned long netlen; + ber_len_t i, noctets; + unsigned char netlen[sizeof(ber_len_t)]; assert( ber != NULL ); assert( len != NULL ); @@ -90,6 +92,8 @@ ber_skip_tag( BerElement *ber, unsigned long *len ) * 2) primitive encodings used whenever possible */ + *len = 0; + /* * First, we read the tag. */ @@ -101,21 +105,28 @@ ber_skip_tag( BerElement *ber, unsigned long *len ) * Next, read the length. The first byte contains the length of * the length. If bit 8 is set, the length is the long form, * otherwise it's the short form. We don't allow a length that's - * greater than what we can hold in an unsigned long. + * greater than what we can hold in a ber_len_t. */ - *len = netlen = 0; if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) return( LBER_DEFAULT ); + if ( lc & 0x80U ) { noctets = (lc & 0x7fU); - if ( (unsigned) noctets > sizeof(unsigned long) ) + + if ( noctets > sizeof(ber_len_t) ) { return( LBER_DEFAULT ); - diff = sizeof(unsigned long) - noctets; - if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets ) - != noctets ) + } + + if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) { return( LBER_DEFAULT ); - *len = AC_NTOHL( netlen ); + } + + for( i = 0; i < noctets; i++ ) { + *len <<= 8; + *len |= netlen[i]; + } + } else { *len = lc; } @@ -123,17 +134,19 @@ ber_skip_tag( BerElement *ber, unsigned long *len ) return( tag ); } -unsigned long +ber_tag_t ber_peek_tag( - LDAP_CONST BerElement *ber_in, /* not const per c-api-02 */ - unsigned long *len ) + BerElement *ber_in, + ber_len_t *len ) { - unsigned long tag; + ber_tag_t tag; BerElement *ber; assert( ber_in != NULL ); assert( BER_VALID( ber_in ) ); + *len = 0; + ber = ber_dup( ber_in ); if( ber == NULL ) { @@ -148,12 +161,13 @@ ber_peek_tag( return( tag ); } -static int -ber_getnint( BerElement *ber, long *num, int len ) +static ber_len_t +ber_getnint( + BerElement *ber, + ber_int_t *num, + ber_len_t len ) { - int diff, sign, i; - long netnum; - char *p; + unsigned char buf[sizeof(ber_int_t)]; assert( ber != NULL ); assert( num != NULL ); @@ -167,32 +181,40 @@ ber_getnint( BerElement *ber, long *num, int len ) * extend after we read it in. */ - if ( (unsigned) len > sizeof(long) ) + if ( len > sizeof(ber_int_t) ) return( -1 ); - netnum = 0; - diff = sizeof(long) - len; - /* read into the low-order bytes of netnum */ - if ( ber_read( ber, ((char *) &netnum) + diff, len ) != len ) + /* read into the low-order bytes of our buffer */ + if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) { return( -1 ); + } - /* sign extend if necessary */ - p = (char *) &netnum; - sign = (0x80 & *(p+diff) ); - if ( sign && ((unsigned) len < sizeof(long)) ) { - for ( i = 0; i < diff; i++ ) { - *(p+i) = (unsigned char) 0xff; + if( len ) { + /* sign extend if necessary */ + ber_len_t i; + ber_int_t netnum = 0x80 & buf[0] ? -1 : 0; + + /* shift in the bytes */ + for( i=0 ; i (*len - 1) ) return( LBER_DEFAULT ); - if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen ) + if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) return( LBER_DEFAULT ); buf[datalen] = '\0'; @@ -250,10 +285,11 @@ ber_get_stringb( BerElement *ber, char *buf, unsigned long *len ) return( tag ); } -unsigned long +ber_tag_t ber_get_stringa( BerElement *ber, char **buf ) { - unsigned long datalen, tag; + ber_len_t datalen; + ber_tag_t tag; assert( ber != NULL ); assert( buf != NULL ); @@ -265,10 +301,10 @@ ber_get_stringa( BerElement *ber, char **buf ) return( LBER_DEFAULT ); } - if ( (*buf = (char *) LBER_MALLOC( (size_t)datalen + 1 )) == NULL ) + if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL ) return( LBER_DEFAULT ); - if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) { + if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) { LBER_FREE( *buf ); *buf = NULL; return( LBER_DEFAULT ); @@ -291,10 +327,11 @@ ber_get_stringa( BerElement *ber, char **buf ) return( tag ); } -unsigned long +ber_tag_t ber_get_stringal( BerElement *ber, struct berval **bv ) { - unsigned long len, tag; + ber_len_t len; + ber_tag_t tag; assert( ber != NULL ); assert( bv != NULL ); @@ -309,13 +346,13 @@ ber_get_stringal( BerElement *ber, struct berval **bv ) if ( (*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) )) == NULL ) return( LBER_DEFAULT ); - if ( ((*bv)->bv_val = (char *) LBER_MALLOC( (size_t)len + 1 )) == NULL ) { + if ( ((*bv)->bv_val = (char *) LBER_MALLOC( len + 1 )) == NULL ) { LBER_FREE( *bv ); *bv = NULL; return( LBER_DEFAULT ); } - if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) { + if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) { ber_bvfree( *bv ); *bv = NULL; return( LBER_DEFAULT ); @@ -340,10 +377,14 @@ ber_get_stringal( BerElement *ber, struct berval **bv ) return( tag ); } -unsigned long -ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen ) +ber_tag_t +ber_get_bitstringa( + BerElement *ber, + char **buf, + ber_len_t *blen ) { - unsigned long datalen, tag; + ber_len_t datalen; + ber_tag_t tag; unsigned char unusedbits; assert( ber != NULL ); @@ -358,7 +399,7 @@ ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen ) } --datalen; - if ( (*buf = (char *) LBER_MALLOC( (size_t)datalen )) == NULL ) + if ( (*buf = (char *) LBER_MALLOC( datalen )) == NULL ) return( LBER_DEFAULT ); if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) { @@ -367,7 +408,7 @@ ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen ) return( LBER_DEFAULT ); } - if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) { + if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) { LBER_FREE( buf ); *buf = NULL; return( LBER_DEFAULT ); @@ -377,10 +418,11 @@ ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen ) return( tag ); } -unsigned long +ber_tag_t ber_get_null( BerElement *ber ) { - unsigned long len, tag; + ber_len_t len; + ber_tag_t tag; assert( ber != NULL ); assert( BER_VALID( ber ) ); @@ -394,11 +436,13 @@ ber_get_null( BerElement *ber ) return( tag ); } -unsigned long -ber_get_boolean( BerElement *ber, int *boolval ) +ber_tag_t +ber_get_boolean( + BerElement *ber, + ber_int_t *boolval ) { - long longbool; - int rc; + ber_int_t longbool; + ber_tag_t rc; assert( ber != NULL ); assert( boolval != NULL ); @@ -411,8 +455,11 @@ ber_get_boolean( BerElement *ber, int *boolval ) return( rc ); } -unsigned long -ber_first_element( BerElement *ber, unsigned long *len, char **last ) +ber_tag_t +ber_first_element( + BerElement *ber, + ber_len_t *len, + char **last ) { assert( ber != NULL ); assert( len != NULL ); @@ -433,8 +480,11 @@ ber_first_element( BerElement *ber, unsigned long *len, char **last ) return( ber_peek_tag( ber, len ) ); } -unsigned long -ber_next_element( BerElement *ber, unsigned long *len, char *last ) +ber_tag_t +ber_next_element( + BerElement *ber, + ber_len_t *len, + LDAP_CONST char *last ) { assert( ber != NULL ); assert( len != NULL ); @@ -450,37 +500,24 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last ) } /* VARARGS */ -unsigned long -ber_scanf -#if HAVE_STDARG - ( BerElement *ber, +ber_tag_t +ber_scanf ( BerElement *ber, LDAP_CONST char *fmt, ... ) -#else - ( va_alist ) -va_dcl -#endif { va_list ap; -#ifndef HAVE_STDARG - BerElement *ber; - char *fmt; -#endif LDAP_CONST char *fmt_reset; char *last; char *s, **ss, ***sss; struct berval ***bv, **bvp, *bval; - int *i, j; - long *l; - unsigned long rc, tag, len; + ber_int_t *i; + int j; + ber_len_t *l; + ber_tag_t *t; + ber_tag_t rc, tag; + ber_len_t len; -#ifdef HAVE_STDARG va_start( ap, fmt ); -#else - va_start( ap ); - ber = va_arg( ap, BerElement * ); - fmt = va_arg( ap, char * ); -#endif assert( ber != NULL ); assert( fmt != NULL ); @@ -513,18 +550,18 @@ va_dcl break; case 'b': /* boolean */ - i = va_arg( ap, int * ); + i = va_arg( ap, ber_int_t * ); rc = ber_get_boolean( ber, i ); break; case 'e': /* enumerated */ case 'i': /* int */ - l = va_arg( ap, long * ); - rc = ber_get_int( ber, l ); + i = va_arg( ap, ber_int_t * ); + rc = ber_get_int( ber, i ); break; case 'l': /* length of next item */ - l = va_arg( ap, long * ); + l = va_arg( ap, ber_len_t * ); rc = ber_peek_tag( ber, l ); break; @@ -534,7 +571,7 @@ va_dcl case 's': /* octet string - in a buffer */ s = va_arg( ap, char * ); - l = va_arg( ap, long * ); + l = va_arg( ap, ber_len_t * ); rc = ber_get_stringb( ber, s, l ); break; @@ -551,18 +588,18 @@ va_dcl case 'B': /* bit string - allocate storage as needed */ ss = va_arg( ap, char ** ); - l = va_arg( ap, long * ); /* for length, in bits */ + l = va_arg( ap, ber_len_t * ); /* for length, in bits */ rc = ber_get_bitstringa( ber, ss, l ); break; case 't': /* tag of next item */ - l = va_arg( ap, long * ); - *l = rc = ber_peek_tag( ber, &len ); + t = va_arg( ap, ber_tag_t * ); + *t = rc = ber_peek_tag( ber, &len ); break; case 'T': /* skip tag of next item */ - l = va_arg( ap, long * ); - *l = rc = ber_skip_tag( ber, &len ); + t = va_arg( ap, ber_tag_t * ); + *t = rc = ber_skip_tag( ber, &len ); break; case 'v': /* sequence of strings */ @@ -634,13 +671,7 @@ va_dcl * Error. Reclaim malloced memory that was given to the caller. * Set allocated pointers to NULL, "data length" outvalues to 0. */ -#ifdef HAVE_STDARG va_start( ap, fmt ); -#else - va_start( ap ); - (void) va_arg( ap, BerElement * ); - (void) va_arg( ap, char * ); -#endif for ( ; fmt_reset < fmt; fmt_reset++ ) { switch ( *fmt_reset ) { @@ -663,20 +694,23 @@ va_dcl break; case 'b': /* boolean */ + case 'e': /* enumerated */ + case 'i': /* int */ (void) va_arg( ap, int * ); break; case 's': /* octet string - in a buffer */ (void) va_arg( ap, char * ); - (void) va_arg( ap, long * ); + (void) va_arg( ap, ber_len_t * ); break; - case 'e': /* enumerated */ - case 'i': /* int */ case 'l': /* length of next item */ + (void) va_arg( ap, ber_len_t * ); + break; + case 't': /* tag of next item */ case 'T': /* skip tag of next item */ - (void) va_arg( ap, long * ); + (void) va_arg( ap, ber_tag_t * ); break; case 'o': /* octet string in a supplied berval */ @@ -702,7 +736,7 @@ va_dcl LBER_FREE( *ss ); *ss = NULL; } - *(va_arg( ap, long * )) = 0; /* for length, in bits */ + *(va_arg( ap, ber_len_t * )) = 0; /* for length, in bits */ break; case 'v': /* sequence of strings */ @@ -745,63 +779,6 @@ va_dcl return( rc ); } -void -ber_bvfree( struct berval *bv ) -{ - assert(bv != NULL); /* bv damn better point to something */ - - if ( bv->bv_val != NULL ) - LBER_FREE( bv->bv_val ); - LBER_FREE( (char *) bv ); -} - -void -ber_bvecfree( struct berval **bv ) -{ - int i; - - assert(bv != NULL); /* bv damn better point to something */ - - for ( i = 0; bv[i] != NULL; i++ ) - ber_bvfree( bv[i] ); - LBER_FREE( (char *) bv ); -} - -struct berval * -ber_bvdup( - LDAP_CONST struct berval *bv ) -{ - struct berval *new; - - assert( bv != NULL ); - - if( bv == NULL ) { - return NULL; - } - - if ( (new = (struct berval *) LBER_MALLOC( sizeof(struct berval) )) - == NULL ) { - return( NULL ); - } - - if ( bv->bv_val == NULL ) { - new->bv_val = NULL; - new->bv_len = 0; - return ( new ); - } - - if ( (new->bv_val = (char *) LBER_MALLOC( bv->bv_len + 1 )) == NULL ) { - LBER_FREE( new ); - return( NULL ); - } - - SAFEMEMCPY( new->bv_val, bv->bv_val, (size_t) bv->bv_len ); - new->bv_val[bv->bv_len] = '\0'; - new->bv_len = bv->bv_len; - - return( new ); -} - #ifdef STR_TRANSLATION void