X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fencode.c;h=f0ea2c8698c9420611e3ccf058a40dbb1d0303b1;hb=d34fffcaf9edc00262209fbe6e04bb15805dbd37;hp=9affa46c677a5e806cade0ecb04aaa94645e7e13;hpb=63bdcda971db7d4b806c32197637b0e62413472d;p=openldap
diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index 9affa46c67..f0ea2c8698 100644
--- a/libraries/liblber/encode.c
+++ b/libraries/liblber/encode.c
@@ -1,11 +1,19 @@
-/* Encode.c - ber output encoding routines */
+/* encode.c - ber output encoding routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -15,6 +23,10 @@
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
#include "portable.h"
@@ -44,18 +56,20 @@ static int ber_put_int_or_enum LDAP_P((
ber_int_t num,
ber_tag_t tag ));
+#define BER_TOP_BYTE(type) (sizeof(type)-1)
+#define BER_TOP_MASK(type) ((type)0xffU << (BER_TOP_BYTE(type)*8))
-static ber_len_t
+static int
ber_calc_taglen( ber_tag_t tag )
{
- int i;
- ber_tag_t mask;
+ int i = BER_TOP_BYTE(ber_tag_t);
+ ber_tag_t mask = BER_TOP_MASK(ber_tag_t);
/* find the first non-all-zero byte in the tag */
- for ( i = sizeof(ber_tag_t) - 1; i > 0; i-- ) {
- mask = ((ber_tag_t)0xffU << (i * 8));
+ for ( ; i > 0; i-- ) {
/* not all zero */
if ( tag & mask ) break;
+ mask >>= 8;
}
return i + 1;
@@ -68,8 +82,8 @@ ber_put_tag(
int nosos )
{
int rc;
- ber_len_t taglen;
- ber_len_t i;
+ int taglen;
+ int i;
unsigned char nettag[sizeof(ber_tag_t)];
assert( ber != NULL );
@@ -77,14 +91,12 @@ ber_put_tag(
taglen = ber_calc_taglen( tag );
- for( i=0; i=0; i-- ) {
+ nettag[i] = (unsigned char)(tag & 0xffU);
tag >>= 8;
}
- rc = ber_write( ber,
- &nettag[sizeof(ber_tag_t) - taglen],
- taglen, nosos );
+ rc = ber_write( ber, (char *) nettag, taglen, nosos );
return rc;
}
@@ -97,20 +109,16 @@ ber_calc_lenlen( ber_len_t len )
* with bit 8 0.
*/
- if ( len <= (ber_len_t) 0x7FU )
- return 1;
+ if ( len <= (ber_len_t) 0x7FU ) return 1;
/*
* long len otherwise - one byte with bit 8 set, giving the
* length of the length, followed by the length itself.
*/
- if ( len <= (ber_len_t) 0xffU )
- return 2;
- if ( len <= (ber_len_t) 0xffffU )
- return 3;
- if ( len <= (ber_len_t) 0xffffffU )
- return 4;
+ if ( len <= (ber_len_t) 0xffU ) return 2;
+ if ( len <= (ber_len_t) 0xffffU ) return 3;
+ if ( len <= (ber_len_t) 0xffffffU ) return 4;
return 5;
}
@@ -143,30 +151,28 @@ ber_put_len( BerElement *ber, ber_len_t len, int nosos )
*/
/* find the first non-all-zero byte */
- for ( i = sizeof(ber_len_t) - 1; i > 0; i-- ) {
- mask = ((ber_len_t)0xffU << (i * 8));
+ i = BER_TOP_BYTE(ber_len_t);
+ mask = BER_TOP_MASK(ber_len_t);
+ for ( ; i > 0; i-- ) {
/* not all zero */
if ( len & mask ) break;
+ mask >>= 8;
}
lenlen = (unsigned char) ++i;
- if ( lenlen > 4 )
- return -1;
+ if ( lenlen > 4 ) return -1;
lenlen |= 0x80UL;
/* write the length of the length */
- if ( ber_write( ber, &lenlen, 1, nosos ) != 1 )
- return -1;
+ if ( ber_write( ber, &lenlen, 1, nosos ) != 1 ) return -1;
- for( j=0; j=0; j-- ) {
+ netlen[j] = (unsigned char)(len & 0xffU);
len >>= 8;
}
/* write the length itself */
- rc = ber_write( ber,
- &netlen[sizeof(ber_len_t)-i],
- i, nosos );
+ rc = ber_write( ber, (char *) netlen, i, nosos );
return rc == i ? i+1 : -1;
}
@@ -178,8 +184,8 @@ ber_put_int_or_enum(
ber_tag_t tag )
{
int rc;
- int i, j, sign;
- ber_len_t len, lenlen, taglen;
+ int i, j, sign, taglen, lenlen;
+ ber_len_t len;
ber_uint_t unum, mask;
unsigned char netnum[sizeof(ber_uint_t)];
@@ -193,9 +199,9 @@ ber_put_int_or_enum(
* high bit is set - look for first non-all-one byte
* high bit is clear - look for first non-all-zero byte
*/
- for ( i = sizeof(ber_int_t) - 1; i > 0; i-- ) {
- mask = ((ber_uint_t)0xffU << (i * 8));
-
+ i = BER_TOP_BYTE(ber_int_t);
+ mask = BER_TOP_MASK(ber_uint_t);
+ for ( ; i > 0; i-- ) {
if ( sign ) {
/* not all ones */
if ( (unum & mask) != mask ) break;
@@ -203,6 +209,7 @@ ber_put_int_or_enum(
/* not all zero */
if ( unum & mask ) break;
}
+ mask >>= 8;
}
/*
@@ -220,18 +227,17 @@ ber_put_int_or_enum(
return -1;
}
- if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 )
+ if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 ) {
return -1;
+ }
i++;
- for( j=0; j=0; j-- ) {
+ netnum[j] = (unsigned char)(unum & 0xffU);
unum >>= 8;
}
- rc = ber_write( ber,
- &netnum[sizeof(ber_int_t) - i],
- i, 0 );
+ rc = ber_write( ber, (char *) netnum, i, 0 );
/* length of tag + length + contents */
return rc == i ? taglen + lenlen + i : -1;
@@ -276,8 +282,7 @@ ber_put_ostring(
ber_len_t len,
ber_tag_t tag )
{
- ber_len_t taglen, lenlen;
- int rc;
+ int taglen, lenlen, rc;
assert( ber != NULL );
assert( str != NULL );
@@ -292,7 +297,8 @@ ber_put_ostring(
return -1;
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 ||
- (ber_len_t) ber_write( ber, str, len, 0 ) != len ) {
+ (ber_len_t) ber_write( ber, str, len, 0 ) != len )
+ {
rc = -1;
} else {
/* return length of tag + length + contents */
@@ -339,7 +345,8 @@ ber_put_bitstring(
ber_len_t blen /* in bits */,
ber_tag_t tag )
{
- ber_len_t taglen, lenlen, len;
+ int taglen, lenlen;
+ ber_len_t len;
unsigned char unusedbits;
assert( ber != NULL );
@@ -376,7 +383,7 @@ ber_put_bitstring(
int
ber_put_null( BerElement *ber, ber_tag_t tag )
{
- ber_len_t taglen;
+ int taglen;
assert( ber != NULL );
assert( LBER_VALID( ber ) );
@@ -402,7 +409,7 @@ ber_put_boolean(
ber_int_t boolval,
ber_tag_t tag )
{
- ber_len_t taglen;
+ int taglen;
unsigned char c;
assert( ber != NULL );
@@ -421,9 +428,7 @@ ber_put_boolean(
c = boolval ? (unsigned char) ~0U : (unsigned char) 0U;
- if ( ber_write( ber, (char *) &c, 1, 0 )
- != 1 )
- {
+ if ( ber_write( ber, (char *) &c, 1, 0 ) != 1 ) {
return -1;
}
@@ -442,7 +447,7 @@ ber_start_seqorset(
assert( ber != NULL );
assert( LBER_VALID( ber ) );
- new = (Seqorset *) LBER_CALLOC( 1, sizeof(Seqorset) );
+ new = (Seqorset *) ber_memcalloc_x( 1, sizeof(Seqorset), ber->ber_memctx );
if ( new == NULL ) {
return -1;
@@ -497,7 +502,8 @@ ber_put_seqorset( BerElement *ber )
int rc;
ber_len_t len;
unsigned char netlen[sizeof(ber_len_t)];
- ber_len_t taglen, lenlen;
+ int taglen;
+ ber_len_t lenlen;
unsigned char ltag = 0x80U + FOUR_BYTE_LEN - 1;
Seqorset *next;
Seqorset **sos = &ber->ber_sos;
@@ -529,19 +535,21 @@ ber_put_seqorset( BerElement *ber )
}
if( lenlen > 1 ) {
- ber_len_t i;
- for( i=0; i < lenlen-1; i++ ) {
- netlen[(sizeof(ber_len_t)-1) - i] =
- (unsigned char)((len >> i*8) & 0xffU);
+ int i;
+ ber_len_t j = len;
+ for( i=lenlen-2; i >= 0; i-- ) {
+ netlen[i] = j & 0xffU;
+ j >>= 8;
}
} else {
- netlen[sizeof(ber_len_t)-1] = (unsigned char)(len & 0x7fU);
+ netlen[0] = (unsigned char)(len & 0x7fU);
}
if ( (next = (*sos)->sos_next) == NULL ) {
/* write the tag */
- if ( (taglen = ber_put_tag( ber, (*sos)->sos_tag, 1 )) == -1 )
+ if ( (taglen = ber_put_tag( ber, (*sos)->sos_tag, 1 )) == -1 ) {
return( -1 );
+ }
if ( ber->ber_options & LBER_USE_DER ) {
/* Write the length in the minimum # of octets */
@@ -567,9 +575,7 @@ ber_put_seqorset( BerElement *ber )
}
/* the length itself */
- rc = ber_write( ber,
- &netlen[sizeof(ber_len_t) - (FOUR_BYTE_LEN-1)],
- FOUR_BYTE_LEN-1, 1 );
+ rc = ber_write( ber, (char *) netlen, FOUR_BYTE_LEN-1, 1 );
if( rc != FOUR_BYTE_LEN - 1 ) {
return -1;
@@ -579,7 +585,7 @@ ber_put_seqorset( BerElement *ber )
(*sos)->sos_ber->ber_ptr += len;
} else {
- ber_len_t i;
+ int i;
unsigned char nettag[sizeof(ber_tag_t)];
ber_tag_t tmptag = (*sos)->sos_tag;
@@ -601,14 +607,12 @@ ber_put_seqorset( BerElement *ber )
/* the tag */
taglen = ber_calc_taglen( tmptag );
- for( i = 0; i < taglen; i++ ) {
- nettag[(sizeof(ber_tag_t)-1) - i] = (unsigned char)(tmptag & 0xffU);
+ for( i = taglen-1; i >= 0; i-- ) {
+ nettag[i] = (unsigned char)(tmptag & 0xffU);
tmptag >>= 8;
}
- AC_FMEMCPY( (*sos)->sos_first,
- &nettag[sizeof(ber_tag_t) - taglen],
- taglen );
+ AC_FMEMCPY( (*sos)->sos_first, nettag, taglen );
if ( ber->ber_options & LBER_USE_DER ) {
ltag = (lenlen == 1)
@@ -622,9 +626,7 @@ ber_put_seqorset( BerElement *ber )
if ( ber->ber_options & LBER_USE_DER ) {
if (lenlen > 1) {
/* Write the length itself */
- AC_FMEMCPY( (*sos)->sos_first + 2,
- &netlen[sizeof(ber_len_t) - (lenlen - 1)],
- lenlen - 1 );
+ AC_FMEMCPY( (*sos)->sos_first + 2, netlen, lenlen - 1 );
}
if (lenlen != FOUR_BYTE_LEN) {
/*
@@ -639,8 +641,7 @@ ber_put_seqorset( BerElement *ber )
} else {
/* the length itself */
AC_FMEMCPY( (*sos)->sos_first + taglen + 1,
- &netlen[sizeof(ber_len_t) - (FOUR_BYTE_LEN - 1)],
- FOUR_BYTE_LEN - 1 );
+ netlen, FOUR_BYTE_LEN - 1 );
}
next->sos_clen += (taglen + lenlen + len);
@@ -648,7 +649,7 @@ ber_put_seqorset( BerElement *ber )
}
/* we're done with this seqorset, so free it up */
- LBER_FREE( (char *) (*sos) );
+ ber_memfree_x( (char *) (*sos), ber->ber_memctx );
*sos = next;
return taglen + lenlen + len;
@@ -810,22 +811,18 @@ ber_printf( BerElement *ber, LDAP_CONST char *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;
}
- if ( ber->ber_usertag == 0 )
+ if ( ber->ber_usertag == 0 ) {
ber->ber_tag = LBER_DEFAULT;
- else
+ } else {
ber->ber_usertag = 0;
+ }
}
va_end( ap );