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.105 and 1.108

version 1.105, 2006/02/14 22:18:12	version 1.108, 2007/03/23 14:27:38
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.104 2006/01/03 22:12:07 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.107 2007/03/20 14:10:16 hyc Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2006 The OpenLDAP Foundation.	* Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 45 static ber_len_t ber_getnint LDAP_P((	Line 45 static ber_len_t ber_getnint LDAP_P((
ber_int_t *num,	ber_int_t *num,
ber_len_t len ));	ber_len_t len ));

	/* out->bv_len should be the buffer size on input */
	int
	ber_decode_oid( BerValue in, BerValue out )
	{
	unsigned char *der = in->bv_val;
	unsigned long val, val1;
	int i, len;
	char *ptr;

	assert( in != NULL );
	assert( out != NULL );

	/* expands by 5/2, and we add dots - call it 3 */
	if ( !out->bv_val \|\| out->bv_len < in->bv_len * 3 )
	return -1;

	val1 = der[0] / 40;
	val = der[0] - val1 * 40;

	len = sprintf( out->bv_val, "%ld.%ld", val1, val );
	ptr = out->bv_val + len;
	val = 0;
	for ( i=1; i<in->bv_len; i++ ) {
	val = val << 7;
	val \|= der[i] & 0x7f;
	if ( !( der[i] & 0x80 )) {
	ptr += sprintf( ptr, ".%ld", val );
	val = 0;
	}
	}
	out->bv_len = ptr - out->bv_val;
	return 0;
	}

/* return the tag - LBER_DEFAULT returned means trouble */	/* return the tag - LBER_DEFAULT returned means trouble */
ber_tag_t	ber_tag_t
ber_get_tag( BerElement *ber )	ber_get_tag( BerElement *ber )
Line 437 nomem:	Line 471 nomem:
}	}

ber_tag_t	ber_tag_t
ber_get_stringbv( BerElement ber, struct berval bv, int alloc )	ber_get_stringbv( BerElement ber, struct berval bv, int option )
{	{
ber_tag_t tag;	ber_tag_t tag;

Line 455 ber_get_stringbv( BerElement *ber, struc	Line 489 ber_get_stringbv( BerElement *ber, struc
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( alloc ) {	if ( option & LBER_BV_ALLOC ) {
bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,	bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
ber->ber_memctx );	ber->ber_memctx );
if ( bv->bv_val == NULL ) {	if ( bv->bv_val == NULL ) {
Line 474 ber_get_stringbv( BerElement *ber, struc	Line 508 ber_get_stringbv( BerElement *ber, struc
ber->ber_ptr += bv->bv_len;	ber->ber_ptr += bv->bv_len;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;	ber->ber_tag = (unsigned char )ber->ber_ptr;
bv->bv_val[bv->bv_len] = '\0';	if ( !( option & LBER_BV_NOTERM ))
	bv->bv_val[bv->bv_len] = '\0';

return tag;	return tag;
}	}

ber_tag_t	ber_tag_t
ber_get_stringbv_null( BerElement ber, struct berval bv, int alloc )	ber_get_stringbv_null( BerElement ber, struct berval bv, int option )
{	{
ber_tag_t tag;	ber_tag_t tag;

Line 504 ber_get_stringbv_null( BerElement *ber,	Line 539 ber_get_stringbv_null( BerElement *ber,
return tag;	return tag;
}	}

if ( alloc ) {	if ( option & LBER_BV_ALLOC ) {
bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,	bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
ber->ber_memctx );	ber->ber_memctx );
if ( bv->bv_val == NULL ) {	if ( bv->bv_val == NULL ) {
Line 523 ber_get_stringbv_null( BerElement *ber,	Line 558 ber_get_stringbv_null( BerElement *ber,
ber->ber_ptr += bv->bv_len;	ber->ber_ptr += bv->bv_len;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;	ber->ber_tag = (unsigned char )ber->ber_ptr;
bv->bv_val[bv->bv_len] = '\0';	if ( !( option & LBER_BV_NOTERM ))
	bv->bv_val[bv->bv_len] = '\0';

return tag;	return tag;
}	}
Line 536 ber_get_stringa( BerElement ber, char	Line 572 ber_get_stringa( BerElement ber, char

assert( buf != NULL );	assert( buf != NULL );

tag = ber_get_stringbv( ber, &bv, 1 );	tag = ber_get_stringbv( ber, &bv, LBER_BV_ALLOC );
*buf = bv.bv_val;	*buf = bv.bv_val;

return tag;	return tag;
Line 550 ber_get_stringa_null( BerElement *ber, c	Line 586 ber_get_stringa_null( BerElement *ber, c

assert( buf != NULL );	assert( buf != NULL );

tag = ber_get_stringbv_null( ber, &bv, 1 );	tag = ber_get_stringbv_null( ber, &bv, LBER_BV_ALLOC );
*buf = bv.bv_val;	*buf = bv.bv_val;

return tag;	return tag;
Line 570 ber_get_stringal( BerElement *ber, struc	Line 606 ber_get_stringal( BerElement *ber, struc
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

tag = ber_get_stringbv( ber, *bv, 1 );	tag = ber_get_stringbv( ber, *bv, LBER_BV_ALLOC );
if ( tag == LBER_DEFAULT ) {	if ( tag == LBER_DEFAULT ) {
LBER_FREE( *bv );	LBER_FREE( *bv );
*bv = NULL;	*bv = NULL;
Line 811 ber_scanf ( BerElement *ber,	Line 847 ber_scanf ( BerElement *ber,

case 'o': /* octet string in a supplied berval */	case 'o': /* octet string in a supplied berval */
bval = va_arg( ap, struct berval * );	bval = va_arg( ap, struct berval * );
rc = ber_get_stringbv( ber, bval, 1 );	rc = ber_get_stringbv( ber, bval, LBER_BV_ALLOC );
break;	break;

case 'O': /* octet string - allocate & include length */	case 'O': /* octet string - allocate & include length */
Line 840 ber_scanf ( BerElement *ber,	Line 876 ber_scanf ( BerElement *ber,
bgbvr cookie = { ChArray };	bgbvr cookie = { ChArray };
cookie.ber = ber;	cookie.ber = ber;
cookie.res.c = va_arg( ap, char *** );	cookie.res.c = va_arg( ap, char *** );
cookie.alloc = 1;	cookie.alloc = LBER_BV_ALLOC;
rc = ber_get_stringbvl( &cookie, NULL );	rc = ber_get_stringbvl( &cookie, NULL );
break;	break;
}	}
Line 850 ber_scanf ( BerElement *ber,	Line 886 ber_scanf ( BerElement *ber,
bgbvr cookie = { BvVec };	bgbvr cookie = { BvVec };
cookie.ber = ber;	cookie.ber = ber;
cookie.res.bv = va_arg( ap, struct berval *** );	cookie.res.bv = va_arg( ap, struct berval *** );
cookie.alloc = 1;	cookie.alloc = LBER_BV_ALLOC;
rc = ber_get_stringbvl( &cookie, NULL );	rc = ber_get_stringbvl( &cookie, NULL );
break;	break;
}	}
Line 860 ber_scanf ( BerElement *ber,	Line 896 ber_scanf ( BerElement *ber,
bgbvr cookie = { BvArray };	bgbvr cookie = { BvArray };
cookie.ber = ber;	cookie.ber = ber;
cookie.res.ba = va_arg( ap, struct berval ** );	cookie.res.ba = va_arg( ap, struct berval ** );
cookie.alloc = 1;	cookie.alloc = LBER_BV_ALLOC;
rc = ber_get_stringbvl( &cookie, NULL );	rc = ber_get_stringbvl( &cookie, NULL );
break;	break;
}	}

Removed from v.1.105
changed lines
	Added in v.1.108