← 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/checker/pkix_revocationchecker.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/checker/pkix_revocationchecker.c
250
250
    pkix_RevocationMethod *method = NULL;
251
251
    pkix_LocalRevocationCheckFn *localRevChecker = NULL;
252
252
    pkix_ExternalRevocationCheckFn *externRevChecker = NULL;
 
253
    PKIX_UInt32 miFlags;
253
254
    
254
255
    PKIX_ENTER(REVOCATIONCHECKER, "PKIX_RevocationChecker_CreateAndAddMethod");
255
256
    PKIX_NULLCHECK_ONE(revChecker);
256
257
 
 
258
    /* If the caller has said "Either one is sufficient, then don't let the 
 
259
     * absence of any one method's info lead to an overall failure.
 
260
     */
 
261
    miFlags = isLeafMethod ? revChecker->leafMethodListFlags 
 
262
                           : revChecker->chainMethodListFlags;
 
263
    if (miFlags & PKIX_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE)
 
264
        flags &= ~PKIX_REV_M_FAIL_ON_MISSING_FRESH_INFO;
 
265
 
257
266
    switch (methodType) {
258
267
    case PKIX_RevocationMethod_CRL:
259
268
        localRevChecker = pkix_CrlChecker_CheckLocal;