← Back to branch summary

~ubuntu-branches/ubuntu/maverick/nss/maverick

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_colcertstore.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_colcertstore.c
568
568
        PKIX_List *certList = NULL;
569
569
        PKIX_PL_Cert *certItem = NULL;
570
570
        char *dirName = NULL;
571
 
        char *prErrorText = NULL;
572
571
        char *pathName = NULL;
573
572
        PKIX_UInt32 dirNameLen = 0;
574
573
        PRErrorCode prError = 0;
575
 
        PRInt32 prErrorTextLen = 0;
576
574
        PRDir *dir = NULL;
577
575
        PRDirEntry *dirEntry = NULL;
578
576
 
678
676
        }
679
677
 
680
678
        if ((prError != 0) && (prError != PR_NO_MORE_FILES_ERROR)) {
681
 
                PKIX_COLLECTIONCERTSTORECONTEXT_DEBUG
682
 
                        ("\t\t Calling PR_GetErrorText.\n");
683
 
                prErrorTextLen = PR_GetErrorText(prErrorText);
684
 
                /* PKIX_ERROR(prErrorText); */
685
 
                pkixErrorReceived = PKIX_TRUE;
686
 
                pkixErrorMsg = prErrorText;
687
 
                goto cleanup;
 
679
                PKIX_ERROR(PKIX_COLLECTIONCERTSTOREPOPULATECERTFAILED);
688
680
        }
689
681
 
690
682
        PKIX_CHECK(PKIX_List_SetImmutable(certList, plContext),
700
692
                PR_CloseDir(dir);
701
693
        }
702
694
 
703
 
        PKIX_FREE(prErrorText);
704
695
        PKIX_FREE(pathName);
705
696
        PKIX_FREE(dirName);
706
697
 
745
736
        PKIX_List *crlList = NULL;
746
737
        PKIX_PL_CRL *crlItem = NULL;
747
738
        char *dirName = NULL;
748
 
        char *prErrorText = NULL;
749
739
        char *pathName = NULL;
750
740
        PKIX_UInt32 dirNameLen = 0;
751
741
        PRErrorCode prError = 0;
752
 
        PRInt32 prErrorTextLen = 0;
753
742
        PRDir *dir = NULL;
754
743
        PRDirEntry *dirEntry = NULL;
755
744
 
855
844
        }
856
845
 
857
846
        if ((prError != 0) && (prError != PR_NO_MORE_FILES_ERROR)) {
858
 
                PKIX_COLLECTIONCERTSTORECONTEXT_DEBUG
859
 
                        ("\t\t Calling PR_GetErrorText.\n");
860
 
                prErrorTextLen = PR_GetErrorText(prErrorText);
861
 
 
862
 
                /* PKIX_ERROR(prErrorText); */
863
 
                pkixErrorReceived = PKIX_TRUE;
864
 
                pkixErrorMsg = prErrorText;
865
 
                goto cleanup;
 
847
                PKIX_ERROR(PKIX_COLLECTIONCERTSTORECONTEXTGETSELECTCRLFAILED);
866
848
        }
867
849
 
868
850
        PKIX_CHECK(PKIX_List_SetImmutable(crlList, plContext),
878
860
                PR_CloseDir(dir);
879
861
        }
880
862
 
881
 
        PKIX_FREE(prErrorText);
882
863
        PKIX_FREE(pathName);
883
864
        PKIX_FREE(dirName);
884
865
 
1316
1297
                    NULL, /* GetCertContinue */
1317
1298
                    NULL, /* GetCRLContinue */
1318
1299
                    pkix_pl_CollectionCertStore_CheckTrust,
 
1300
                    NULL,      /* can not store crls */
 
1301
                    NULL,      /* can not do revocation check */
1319
1302
                    (PKIX_PL_Object *)colCertStoreContext,
1320
1303
                    PKIX_TRUE, /* cache flag */
1321
1304
                    PKIX_TRUE, /* local - no network I/O */