/* 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
#include <ac/string.h>
#include <ac/socket.h>
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
#include "lber-int.h"
static ber_len_t ber_getnint LDAP_P((
{
unsigned char xbyte;
ber_tag_t tag;
- char *tagp;
unsigned int i;
assert( ber != NULL );
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
return( LBER_DEFAULT );
+ tag = xbyte;
+
if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )
- return( (ber_tag_t) xbyte );
+ return tag;
- tagp = (char *) &tag;
- tagp[0] = xbyte;
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;
if ( i == sizeof(ber_tag_t) )
return( LBER_DEFAULT );
- /* want leading, not trailing 0's */
- return( tag >> (sizeof(ber_tag_t) - i - 1) );
+ return tag;
}
ber_tag_t
{
ber_tag_t tag;
unsigned char lc;
- ber_len_t noctets;
- int diff;
- ber_len_t netlen;
+ ber_len_t i, noctets;
+ unsigned char netlen[sizeof(ber_len_t)];
assert( ber != NULL );
assert( len != NULL );
* 2) primitive encodings used whenever possible
*/
+ *len = 0;
+
/*
* First, we read the tag.
*/
* 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 ( noctets > sizeof(ber_len_t) )
+
+ if ( noctets > sizeof(ber_len_t) ) {
return( LBER_DEFAULT );
- diff = sizeof(ber_len_t) - noctets;
- if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )
- != noctets )
+ }
+
+ if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
return( LBER_DEFAULT );
- *len = LBER_LEN_NTOH( netlen );
+ }
+
+ for( i = 0; i < noctets; i++ ) {
+ *len <<= 8;
+ *len |= netlen[i];
+ }
+
} else {
*len = lc;
}
ber_tag_t
ber_peek_tag(
- LDAP_CONST BerElement *ber_in,
+ BerElement *ber_in,
ber_len_t *len )
{
ber_tag_t tag;
assert( ber_in != NULL );
assert( BER_VALID( ber_in ) );
+ *len = 0;
+
ber = ber_dup( ber_in );
if( ber == NULL ) {
return( tag );
}
+ber_tag_t
+ber_get_enum(
+ BerElement *ber,
+ ber_int_t *num )
+{
+ return ber_get_int( ber, num );
+}
+
ber_tag_t
ber_get_stringb(
BerElement *ber,
ber_next_element(
BerElement *ber,
ber_len_t *len,
- char *last )
+ LDAP_CONST char *last )
{
assert( ber != NULL );
assert( len != NULL );