libraries/liblber/decode.c - diff

Return to decode.c CVS log

Up to [OpenLDAP] / libraries / liblber

Diff for /libraries/liblber/decode.c between versions 1.37 and 1.61

version 1.37, 1999/08/23 22:27:55	version 1.61, 2001/07/21 21:13:05
Line 1	Line 1
/* decode.c - ber input decoding routines */	/* decode.c - ber input decoding routines */
	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.60 2001/05/06 17:07:24 kurt Exp $ */
/*	/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/	*/
/* Portions	/* Portions
Line 25	Line 26
#include <ac/string.h>	#include <ac/string.h>
#include <ac/socket.h>	#include <ac/socket.h>

#undef LDAP_F_PRE
#define LDAP_F_PRE LDAP_F_EXPORT

#include "lber-int.h"	#include "lber-int.h"

static ber_len_t ber_getnint LDAP_P((	static ber_len_t ber_getnint LDAP_P((
Line 41 ber_get_tag( BerElement *ber )	Line 39 ber_get_tag( BerElement *ber )
{	{
unsigned char xbyte;	unsigned char xbyte;
ber_tag_t tag;	ber_tag_t tag;
char *tagp;
unsigned int i;	unsigned int i;

assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )	tag = xbyte;
return( (ber_tag_t) xbyte );
	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
	return tag;
	}

tagp = (char *) &tag;
tagp[0] = xbyte;
for ( i = 1; i < sizeof(ber_tag_t); i++ ) {	for ( i = 1; i < sizeof(ber_tag_t); i++ ) {
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

tagp[i] = xbyte;	tag <<= 8;
	tag \|= 0x00ffUL & (ber_tag_t) xbyte;

if ( ! (xbyte & LBER_MORE_TAG_MASK) )	if ( ! (xbyte & LBER_MORE_TAG_MASK) ) {
break;	break;
	}
}	}

/* tag too big! */	/* tag too big! */
if ( i == sizeof(ber_tag_t) )	if ( i == sizeof(ber_tag_t) ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

/* want leading, not trailing 0's */	return tag;
return( tag >> (sizeof(ber_tag_t) - i - 1) );
}	}

ber_tag_t	ber_tag_t
Line 78 ber_skip_tag( BerElement *ber, ber_len_t	Line 80 ber_skip_tag( BerElement *ber, ber_len_t
{	{
ber_tag_t tag;	ber_tag_t tag;
unsigned char lc;	unsigned char lc;
ber_len_t noctets;	ber_len_t i, noctets;
int diff;	unsigned char netlen[sizeof(ber_len_t)];
ber_len_t netlen;

assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );	assert( len != NULL );
assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

/*	/*
* Any ber element looks like this: tag length contents.	* Any ber element looks like this: tag length contents.
Line 96 ber_skip_tag( BerElement *ber, ber_len_t	Line 97 ber_skip_tag( BerElement *ber, ber_len_t
* 2) primitive encodings used whenever possible	* 2) primitive encodings used whenever possible
*/	*/

	*len = 0;

/*	/*
* First, we read the tag.	* First, we read the tag.
*/	*/

if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT )	if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

/*	/*
* Next, read the length. The first byte contains the length of	* Next, read the length. The first byte contains the length of
* the length. If bit 8 is set, the length is the long form,	* 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	* otherwise it's the short form. We don't allow a length that's
* greater than what we can hold in a ber_len_t.	* greater than what we can hold in a ber_len_t.
*/	*/

*len = netlen = 0;
if ( ber_read( ber, (char *) &lc, 1 ) != 1 )	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
return( LBER_DEFAULT );	return LBER_DEFAULT;

if ( lc & 0x80U ) {	if ( lc & 0x80U ) {
noctets = (lc & 0x7fU);	noctets = (lc & 0x7fU);
if ( noctets > sizeof(ber_len_t) )
return( LBER_DEFAULT );	if ( noctets > sizeof(ber_len_t) ) {
diff = sizeof(ber_len_t) - noctets;	return LBER_DEFAULT;
if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )	}
!= noctets )
return( LBER_DEFAULT );	if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
*len = LBER_LEN_NTOH( netlen );	return LBER_DEFAULT;
	}

	for( i = 0; i < noctets; i++ ) {
	*len <<= 8;
	*len \|= netlen[i];
	}

} else {	} else {
*len = lc;	*len = lc;
}	}

return( tag );	/* BER element should have enough data left */
	if( *len > ber_pvt_ber_remaining( ber ) ) {
	return LBER_DEFAULT;
	}

	return tag;
}	}

ber_tag_t	ber_tag_t
ber_peek_tag(	ber_peek_tag(
LDAP_CONST BerElement *ber_in,	BerElement *ber,
ber_len_t *len )	ber_len_t *len )
{	{
ber_tag_t tag;	/*
BerElement *ber;	* This implementation assumes ber_skip_tag() only
	* modifies ber_ptr field of the BerElement.
assert( ber_in != NULL );	*/
assert( BER_VALID( ber_in ) );

ber = ber_dup( ber_in );

if( ber == NULL ) {
return LBER_ERROR;
}

assert( BER_VALID( ber ) );	char *save;
	ber_tag_t tag;

	save = ber->ber_ptr;
tag = ber_skip_tag( ber, len );	tag = ber_skip_tag( ber, len );
	ber->ber_ptr = save;

ber_free( ber, 0 );	return tag;
return( tag );
}	}

static ber_len_t	static ber_len_t
Line 164 ber_getnint(	Line 175 ber_getnint(

assert( ber != NULL );	assert( ber != NULL );
assert( num != NULL );	assert( num != NULL );
	assert( LBER_VALID( ber ) );
assert( BER_VALID( ber ) );

/*	/*
* The tag and length have already been stripped off. We should	* The tag and length have already been stripped off. We should
Line 174 ber_getnint(	Line 184 ber_getnint(
* extend after we read it in.	* extend after we read it in.
*/	*/

if ( len > sizeof(ber_int_t) )	if ( len > sizeof(ber_int_t) ) {
return( -1 );	return -1;
	}

/* read into the low-order bytes of our buffer */	/* read into the low-order bytes of our buffer */
if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {	if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
return( -1 );	return -1;
}	}

if( len ) {	if( len ) {
Line 198 ber_getnint(	Line 209 ber_getnint(
*num = 0;	*num = 0;
}	}

return( len );	return len;
}	}

ber_tag_t	ber_tag_t
Line 210 ber_get_int(	Line 221 ber_get_int(
ber_len_t len;	ber_len_t len;

assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( ber_getnint( ber, num, len ) != len )	if ( ber_getnint( ber, num, len ) != len ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
else	}
return( tag );
	return tag;
	}

	ber_tag_t
	ber_get_enum(
	BerElement *ber,
	ber_int_t *num )
	{
	return ber_get_int( ber, num );
}	}

ber_tag_t	ber_tag_t
Line 230 ber_get_stringb(	Line 251 ber_get_stringb(
ber_len_t datalen;	ber_len_t datalen;
ber_tag_t tag;	ber_tag_t tag;

#ifdef STR_TRANSLATION
char *transbuf;
#endif /* STR_TRANSLATION */

assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
if ( datalen > (*len - 1) )	}
return( LBER_DEFAULT );

if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen )
return( LBER_DEFAULT );

buf[datalen] = '\0';	/* must fit within allocated space with termination */
	if ( datalen >= *len ) {
	return LBER_DEFAULT;
	}

#ifdef STR_TRANSLATION	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) {
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0	return LBER_DEFAULT;
&& ber->ber_decode_translate_proc ) {
transbuf = buf;
++datalen;
if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
0 ) != 0 ) {
return( LBER_DEFAULT );
}
if ( datalen > *len ) {
LBER_FREE( transbuf );
return( LBER_DEFAULT );
}
SAFEMEMCPY( buf, transbuf, datalen );
LBER_FREE( transbuf );
--datalen;
}	}
#endif /* STR_TRANSLATION */
	buf[datalen] = '\0';

*len = datalen;	*len = datalen;
return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 279 ber_get_stringa( BerElement ber, char	Line 282 ber_get_stringa( BerElement ber, char
assert( ber != NULL );	assert( ber != NULL );
assert( buf != NULL );	assert( buf != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL )	if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
LBER_FREE( *buf );	LBER_FREE( *buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}
(*buf)[datalen] = '\0';	(*buf)[datalen] = '\0';

#ifdef STR_TRANSLATION	return tag;
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
&& ber->ber_decode_translate_proc ) {
++datalen;
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
!= 0 ) {
LBER_FREE( *buf );
*buf = NULL;
return( LBER_DEFAULT );
}
}
#endif /* STR_TRANSLATION */

return( tag );
}	}

ber_tag_t	ber_tag_t
Line 321 ber_get_stringal( BerElement *ber, struc	Line 312 ber_get_stringal( BerElement *ber, struc
assert( ber != NULL );	assert( ber != NULL );
assert( bv != NULL );	assert( bv != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
*bv = NULL;	*bv = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

	bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) );
	if ( *bv == NULL ) {
	return LBER_DEFAULT;
}	}

if ( (bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) )) == NULL )	if( len == 0 ) {
return( LBER_DEFAULT );	(*bv)->bv_val = NULL;
	(*bv)->bv_len = 0;
	return tag;
	}

if ( ((bv)->bv_val = (char ) LBER_MALLOC( len + 1 )) == NULL ) {	(bv)->bv_val = (char ) LBER_MALLOC( len + 1 );
	if ( (*bv)->bv_val == NULL ) {
LBER_FREE( *bv );	LBER_FREE( *bv );
*bv = NULL;	*bv = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) {	if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) {
ber_bvfree( *bv );	ber_bvfree( *bv );
*bv = NULL;	*bv = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

((*bv)->bv_val)[len] = '\0';	((*bv)->bv_val)[len] = '\0';
(*bv)->bv_len = len;	(*bv)->bv_len = len;

#ifdef STR_TRANSLATION	return tag;
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
&& ber->ber_decode_translate_proc ) {
++len;
if ( ((ber->ber_decode_translate_proc))( &((bv)->bv_val),
&len, 1 ) != 0 ) {
ber_bvfree( *bv );
*bv = NULL;
return( LBER_DEFAULT );
}
(*bv)->bv_len = len - 1;
}
#endif /* STR_TRANSLATION */

return( tag );
}	}

ber_tag_t	ber_tag_t
Line 376 ber_get_bitstringa(	Line 363 ber_get_bitstringa(
assert( buf != NULL );	assert( buf != NULL );
assert( blen != NULL );	assert( blen != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}
--datalen;	--datalen;

if ( (buf = (char ) LBER_MALLOC( datalen )) == NULL )	if ( (buf = (char ) LBER_MALLOC( datalen )) == NULL ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {
LBER_FREE( buf );	LBER_FREE( buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
LBER_FREE( buf );	LBER_FREE( buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

blen = datalen 8 - unusedbits;	blen = datalen 8 - unusedbits;
return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 410 ber_get_null( BerElement *ber )	Line 398 ber_get_null( BerElement *ber )
ber_tag_t tag;	ber_tag_t tag;

assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( len != 0 )	if ( len != 0 ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

return( tag );	return( tag );
}	}
Line 432 ber_get_boolean(	Line 422 ber_get_boolean(
assert( ber != NULL );	assert( ber != NULL );
assert( boolval != NULL );	assert( boolval != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

rc = ber_get_int( ber, &longbool );	rc = ber_get_int( ber, &longbool );
*boolval = longbool;	*boolval = longbool;

return( rc );	return rc;
}	}

ber_tag_t	ber_tag_t
Line 453 ber_first_element(	Line 443 ber_first_element(
/* skip the sequence header, use the len to mark where to stop */	/* skip the sequence header, use the len to mark where to stop */
if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
*last = NULL;	*last = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

last = ber->ber_ptr + len;	last = ber->ber_ptr + len;

if ( *last == ber->ber_ptr ) {	if ( *last == ber->ber_ptr ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

return( ber_peek_tag( ber, len ) );	return ber_peek_tag( ber, len );
}	}

ber_tag_t	ber_tag_t
ber_next_element(	ber_next_element(
BerElement *ber,	BerElement *ber,
ber_len_t *len,	ber_len_t *len,
char *last )	LDAP_CONST char *last )
{	{
assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );	assert( len != NULL );
assert( last != NULL );	assert( last != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( ber->ber_ptr == last ) {	if ( ber->ber_ptr == last ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

return( ber_peek_tag( ber, len ) );	return ber_peek_tag( ber, len );
}	}

/* VARARGS */	/* VARARGS */
Line 494 ber_scanf ( BerElement *ber,	Line 484 ber_scanf ( BerElement *ber,
LDAP_CONST char *fmt_reset;	LDAP_CONST char *fmt_reset;
char *last;	char *last;
char s, ss, **sss;	char s, ss, **sss;
struct berval *bv, bvp, *bval;	struct berval *bv, bvp, *bval;
ber_int_t *i;	ber_int_t *i;
int j;	int j;
ber_len_t *l;	ber_len_t *l;
Line 507 ber_scanf ( BerElement *ber,	Line 497 ber_scanf ( BerElement *ber,
assert( ber != NULL );	assert( ber != NULL );
assert( fmt != NULL );	assert( fmt != NULL );

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

fmt_reset = fmt;	fmt_reset = fmt;

	#ifdef NEW_LOGGING
	LDAP_LOG(( "liblber", LDAP_LEVEL_ENTRY, "ber_scanf fmt (%s) ber:\n", fmt ));
	BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
	#else
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
"ber_scanf fmt (%s) ber:\n", fmt );	"ber_scanf fmt (%s) ber:\n", fmt );
ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );	ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
	#endif

for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
/* When this is modified, remember to update	/* When this is modified, remember to update
Line 641 ber_scanf ( BerElement *ber,	Line 636 ber_scanf ( BerElement *ber,

default:	default:
if( ber->ber_debug ) {	if( ber->ber_debug ) {
	#ifdef NEW_LOGGING
	LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
	"ber_scanf: unknown fmt %c\n", *fmt ));
	#else
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,	ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_scanf: unknown fmt %c\n", *fmt );	"ber_scanf: unknown fmt %c\n", *fmt );
	#endif
}	}
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
break;	break;
Line 727 ber_scanf ( BerElement *ber,	Line 727 ber_scanf ( BerElement *ber,
case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
sss = va_arg( ap, char *** );	sss = va_arg( ap, char *** );
if ( *sss ) {	if ( *sss ) {
for (j = 0; (*sss)[j]; j++) {	for (j = 0; (*sss)[j]; j++) {
LBER_FREE( (*sss)[j] );	LBER_FREE( (*sss)[j] );
(*sss)[j] = NULL;	(*sss)[j] = NULL;
}	}
Line 761 ber_scanf ( BerElement *ber,	Line 761 ber_scanf ( BerElement *ber,
va_end( ap );	va_end( ap );
}	}

return( rc );	return rc;
}


#ifdef STR_TRANSLATION
void
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
BERTranslateProc decode_proc )
{
assert( ber != NULL );
assert( BER_VALID( ber ) );

ber->ber_encode_translate_proc = encode_proc;
ber->ber_decode_translate_proc = decode_proc;
}	}
#endif /* STR_TRANSLATION */

Removed from v.1.37
changed lines
	Added in v.1.61