-/* encode.c - ber output encoding routines */
+/* Encode.c - ber output encoding routines */
/* $OpenLDAP$ */
/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
for ( i = sizeof(ber_tag_t) - 1; i > 0; i-- ) {
mask = ((ber_tag_t)0xffU << (i * 8));
/* not all zero */
- if ( tag & mask )
- break;
+ if ( tag & mask ) break;
}
- return( i + 1 );
+ return i + 1;
}
static int
unsigned char nettag[sizeof(ber_tag_t)];
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
taglen = ber_calc_taglen( tag );
*/
if ( len <= (ber_len_t) 0x7FU )
- return( 1 );
+ return 1;
/*
* long len otherwise - one byte with bit 8 set, giving the
*/
if ( len <= (ber_len_t) 0xffU )
- return( 2 );
+ return 2;
if ( len <= (ber_len_t) 0xffffU )
- return( 3 );
+ return 3;
if ( len <= (ber_len_t) 0xffffffU )
- return( 4 );
+ return 4;
- return( 5 );
+ return 5;
}
static int
unsigned char netlen[sizeof(ber_len_t)];
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
/*
* short len if it's less than 128 - one byte giving the len,
if ( len <= 127 ) {
char length_byte = (char) len;
- return( ber_write( ber, &length_byte, 1, nosos ) );
+ return ber_write( ber, &length_byte, 1, nosos );
}
/*
for ( i = sizeof(ber_len_t) - 1; i > 0; i-- ) {
mask = ((ber_len_t)0xffU << (i * 8));
/* not all zero */
- if ( len & mask )
- break;
+ if ( len & mask ) break;
}
lenlen = (unsigned char) ++i;
if ( lenlen > 4 )
- return( -1 );
+ return -1;
lenlen |= 0x80UL;
/* write the length of the length */
if ( ber_write( ber, &lenlen, 1, nosos ) != 1 )
- return( -1 );
+ return -1;
for( j=0; j<i; j++) {
netlen[(sizeof(ber_len_t)-1) - j] = (unsigned char)(len & 0xffU);
unsigned char netnum[sizeof(ber_uint_t)];
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
sign = (num < 0);
- unum = num; /* Bit fiddling should be done with unsigned values */
+ unum = num; /* Bit fiddling should be done with unsigned values */
/*
* high bit is set - look for first non-all-one byte
if ( sign ) {
/* not all ones */
- if ( (unum & mask) != mask )
- break;
+ if ( (unum & mask) != mask ) break;
} else {
/* not all zero */
- if ( unum & mask )
- break;
+ if ( unum & mask ) break;
}
}
* byte matches the sign bit, we need to "back up" a byte.
*/
mask = (unum & ((ber_uint_t)0x80U << (i * 8)));
- if ( (mask && !sign) || (sign && !mask) )
+ if ( (mask && !sign) || (sign && !mask) ) {
i++;
+ }
len = i + 1;
- if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
- return( -1 );
+ if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 ) {
+ return -1;
+ }
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 )
- return( -1 );
+ return -1;
i++;
for( j=0; j<i; j++ ) {
ber_tag_t tag )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_ENUMERATED;
+ }
- return( ber_put_int_or_enum( ber, num, tag ) );
+ return ber_put_int_or_enum( ber, num, tag );
}
int
ber_tag_t tag )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_INTEGER;
+ }
- return( ber_put_int_or_enum( ber, num, tag ) );
+ return ber_put_int_or_enum( ber, num, tag );
}
int
assert( ber != NULL );
assert( str != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_OCTETSTRING;
+ }
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
- return( -1 );
+ return -1;
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 ||
(ber_len_t) ber_write( ber, str, len, 0 ) != len ) {
rc = taglen + lenlen + len;
}
- return( rc );
+ return rc;
}
int
ber_tag_t tag )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if( bv == NULL || bv->bv_len == 0 ) {
return ber_put_ostring( ber, "", (ber_len_t) 0, tag );
assert( ber != NULL );
assert( str != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- return( ber_put_ostring( ber, str, strlen( str ), tag ));
+ return ber_put_ostring( ber, str, strlen( str ), tag );
}
int
assert( ber != NULL );
assert( str != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_BITSTRING;
+ }
- if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
- return( -1 );
+ if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 ) {
+ return -1;
+ }
len = ( blen + 7 ) / 8;
unusedbits = (unsigned char) ((len * 8) - blen);
- if ( (lenlen = ber_put_len( ber, len + 1, 0 )) == -1 )
- return( -1 );
+ if ( (lenlen = ber_put_len( ber, len + 1, 0 )) == -1 ) {
+ return -1;
+ }
- if ( ber_write( ber, (char *)&unusedbits, 1, 0 ) != 1 )
- return( -1 );
+ if ( ber_write( ber, (char *)&unusedbits, 1, 0 ) != 1 ) {
+ return -1;
+ }
- if ( (ber_len_t) ber_write( ber, str, len, 0 ) != len )
- return( -1 );
+ if ( (ber_len_t) ber_write( ber, str, len, 0 ) != len ) {
+ return -1;
+ }
/* return length of tag + length + unused bit count + contents */
- return( taglen + 1 + lenlen + len );
+ return taglen + 1 + lenlen + len;
}
int
ber_len_t taglen;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_NULL;
+ }
- if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
- return( -1 );
+ if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 ) {
+ return -1;
+ }
- if ( ber_put_len( ber, 0, 0 ) != 1 )
- return( -1 );
+ if ( ber_put_len( ber, 0, 0 ) != 1 ) {
+ return -1;
+ }
- return( taglen + 1 );
+ return taglen + 1;
}
int
unsigned char falseval = 0;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if ( tag == LBER_DEFAULT )
tag = LBER_BOOLEAN;
- if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
- return( -1 );
+ if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 ) {
+ return -1;
+ }
- if ( ber_put_len( ber, 1, 0 ) != 1 )
- return( -1 );
+ if ( ber_put_len( ber, 1, 0 ) != 1 ) {
+ return -1;
+ }
if ( ber_write( ber, (char *)(boolval ? &trueval : &falseval), 1, 0 )
- != 1 )
- return( -1 );
+ != 1 )
+ {
+ return -1;
+ }
- return( taglen + 2 );
+ return taglen + 2;
}
#define FOUR_BYTE_LEN 5
Seqorset *new;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
new = (Seqorset *) LBER_CALLOC( 1, sizeof(Seqorset) );
- if ( new == NULL )
- return( -1 );
+ if ( new == NULL ) {
+ return -1;
+ }
new->sos_ber = ber;
- if ( ber->ber_sos == NULL )
+ if ( ber->ber_sos == NULL ) {
new->sos_first = ber->ber_ptr;
- else
+ } else {
new->sos_first = ber->ber_sos->sos_ptr;
+ }
/* Set aside room for a 4 byte length field */
new->sos_ptr = new->sos_first + ber_calc_taglen( tag ) + FOUR_BYTE_LEN;
new->sos_next = ber->ber_sos;
ber->ber_sos = new;
- return( 0 );
+ return 0;
}
int
ber_start_seq( BerElement *ber, ber_tag_t tag )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_SEQUENCE;
+ }
- return( ber_start_seqorset( ber, tag ) );
+ return ber_start_seqorset( ber, tag );
}
int
ber_start_set( BerElement *ber, ber_tag_t tag )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- if ( tag == LBER_DEFAULT )
+ if ( tag == LBER_DEFAULT ) {
tag = LBER_SET;
+ }
- return( ber_start_seqorset( ber, tag ) );
+ return ber_start_seqorset( ber, tag );
}
static int
Seqorset **sos = &ber->ber_sos;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
/*
* If this is the toplevel sequence or set, we need to actually
- * write the stuff out. Otherwise, it's already been put in
+ * write the stuff out. Otherwise, it's already been put in
* the appropriate buffer and will be written when the toplevel
* one is written. In this case all we need to do is update the
* length and tag.
len = (*sos)->sos_clen;
- if ( sizeof(ber_len_t) > 4 && len > 0xffffffffUL )
- return( -1 );
+ if ( sizeof(ber_len_t) > 4 && len > 0xffffffffUL ) {
+ return -1;
+ }
if ( ber->ber_options & LBER_USE_DER ) {
lenlen = ber_calc_lenlen( len );
if ( ber->ber_options & LBER_USE_DER ) {
/* Write the length in the minimum # of octets */
- if ( ber_put_len( ber, len, 1 ) == -1 )
- return( -1 );
+ if ( ber_put_len( ber, len, 1 ) == -1 ) {
+ return -1;
+ }
if (lenlen != FOUR_BYTE_LEN) {
/*
} else {
/* Fill FOUR_BYTE_LEN bytes for length field */
/* one byte of length length */
- if ( ber_write( ber, (char *)<ag, 1, 1 ) != 1 )
- return( -1 );
+ if ( ber_write( ber, (char *)<ag, 1, 1 ) != 1 ) {
+ return -1;
+ }
/* the length itself */
rc = ber_write( ber,
FOUR_BYTE_LEN-1, 1 );
if( rc != FOUR_BYTE_LEN - 1 ) {
- return( -1 );
+ return -1;
}
}
/* The ber_ptr is at the set/seq start - move it to the end */
/* The sos_ptr exceeds the end of the BerElement
* this can happen, for example, when the sos_ptr
* is near the end and no data was written for the
- * 'V'. We must realloc the BerElement to ensure
+ * 'V'. We must realloc the BerElement to ensure
* we don't overwrite the buffer when writing
* the tag and length fields.
*/
LBER_FREE( (char *) (*sos) );
*sos = next;
- return( taglen + lenlen + len );
+ return taglen + lenlen + len;
}
int
ber_put_seq( BerElement *ber )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- return( ber_put_seqorset( ber ) );
+ return ber_put_seqorset( ber );
}
int
ber_put_set( BerElement *ber )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- return( ber_put_seqorset( ber ) );
+ return ber_put_seqorset( ber );
}
/* N tag */
assert( ber != NULL );
assert( fmt != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
va_start( ap, fmt );
default:
if( ber->ber_debug ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
+ "ber_printf: unknown fmt %c\n", *fmt ));
+#else
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_printf: unknown fmt %c\n", *fmt );
+#endif
}
rc = -1;
break;
va_end( ap );
- return( rc );
+ return rc;
}
projects / openldap / blobdiff