← 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/pkcs12/p12d.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/pkcs12/p12d.c
2407
2407
        rv = PK11_ImportDERCert(cert->slot, derCert, CK_INVALID_HANDLE,
2408
2408
                                                        nickData, PR_FALSE);
2409
2409
    }
2410
 
 
 
2410
    if (rv) {
 
2411
        cert->problem = 1;
 
2412
        cert->error = PORT_GetError();
 
2413
    }
2411
2414
    cert->installed = PR_TRUE;
2412
2415
    if(nickName) SECITEM_ZfreeItem(nickName, PR_TRUE);
2413
2416
    return rv;