← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/pkcs7/certread.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/pkcs7/certread.c
360
360
        while ( cl >= NS_CERT_TRAILER_LEN ) {
361
361
            if ( !PORT_Strncasecmp((char *)cp, NS_CERT_TRAILER,
362
362
                                   NS_CERT_TRAILER_LEN) ) {
363
 
                certend = (unsigned char *)cp;
 
363
                certend = cp;
364
364
                break;
365
365
            }
366
366
 
383
383
 
384
384
        *certend = 0;
385
385
        /* convert to binary */
386
 
        bincert = ATOB_AsciiToData(certbegin, &binLen);
 
386
        bincert = ATOB_AsciiToData((char *)certbegin, &binLen);
387
387
        if (!bincert) {
388
388
            rv = SECFailure;
389
389
            goto loser;