← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/util/secasn1d.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-31 02:23:43 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100331022343-ck07ylqk8q474x26
Tags: 3.12.6-0ubuntu0.9.10.1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols 
* Enable transitional scheme for SSL renegotiation
  - add 97_SSL_RENEGOTIATE_TRANSITIONAL.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/util/secasn1d.c
38
38
 * Support for DEcoding ASN.1 data based on BER/DER (Basic/Distinguished
39
39
 * Encoding Rules).
40
40
 *
41
 
 * $Id: secasn1d.c,v 1.38 2007/10/12 01:44:51 julien.pierre.boogz%sun.com Exp $
 
41
 * $Id: secasn1d.c,v 1.39 2009/04/07 23:52:10 julien.pierre.boogz%sun.com Exp $
42
42
 */
43
43
 
44
44
/* #define DEBUG_ASN1D_STATES 1 */
2086
2086
        }
2087
2087
 
2088
2088
        if (is_bit_string) {
2089
 
#ifdef XP_WIN16         /* win16 compiler gets an internal error otherwise */
2090
 
            alloc_len = (((long)item_len + 7) / 8);
2091
 
#else
2092
2089
            alloc_len = ((item_len + 7) >> 3);
2093
 
#endif
2094
2090
        } else {
2095
2091
            /*
2096
2092
             * Add 2 for the end-of-contents octets of an indefinite-length