← 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/libpkix/pkix/store/pkix_store.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/libpkix/pkix/store/pkix_store.c
299
299
PKIX_CertStore_CertContinue(
300
300
        PKIX_CertStore *store,
301
301
        PKIX_CertSelector *selector,
 
302
        PKIX_VerifyNode *verifyNode,
302
303
        void **pNBIOContext,
303
304
        PKIX_List **pCertList,
304
305
        void *plContext)
307
308
        PKIX_NULLCHECK_FOUR(store, selector, pNBIOContext, pCertList);
308
309
 
309
310
        PKIX_CHECK(store->certContinue
310
 
                (store, selector, pNBIOContext, pCertList, plContext),
 
311
                   (store, selector, verifyNode,
 
312
                    pNBIOContext, pCertList, plContext),
311
313
                PKIX_CERTSTORECERTCONTINUEFUNCTIONFAILED);
312
314
 
313
315
cleanup: