← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/cmd/crlutil/crlutil.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/cmd/crlutil/crlutil.c
360
360
                PRFileDesc *inFile, PRInt32 decodeOptions,
361
361
                PRInt32 importOptions)
362
362
{
363
 
    SECItem crlDER;
 
363
    SECItem crlDER = {0, NULL, 0};
364
364
    CERTSignedCrl *signCrl = NULL;
365
365
    CERTSignedCrl *modCrl = NULL;
366
366
    PRArenaPool *modArena = NULL;
367
367
    SECStatus rv = SECSuccess;
368
368
 
369
 
    PORT_Assert(arena != NULL && certHandle != NULL &&
370
 
                certNickName != NULL);
371
369
    if (!arena || !certHandle || !certNickName) {
 
370
        PORT_SetError(SEC_ERROR_INVALID_ARGS);
372
371
        SECU_PrintError(progName, "CreateModifiedCRLCopy: invalid args\n");
373
372
        return NULL;
374
373
    }
444
443
    signCrl->arena = arena;
445
444
 
446
445
  loser:
447
 
    SECITEM_FreeItem(&crlDER, PR_FALSE);
 
446
    if (crlDER.data) {
 
447
        SECITEM_FreeItem(&crlDER, PR_FALSE);
 
448
    }
448
449
    if (modCrl)
449
450
        SEC_DestroyCrl(modCrl);
450
451
    if (rv != SECSuccess && signCrl) {
466
467
 
467
468
    /* if the CERTSignedCrl structure changes, this function will need to be
468
469
       updated as well */
469
 
    PORT_Assert(cert != NULL);
470
470
    if (!cert || !arena) {
 
471
        PORT_SetError(SEC_ERROR_INVALID_ARGS);
471
472
        SECU_PrintError(progName, "invalid args for function "
472
473
                        "CreateNewCrl\n");
473
474
        return NULL;
531
532
    CRLGENGeneratorData *crlGenData = NULL;
532
533
    SECStatus rv;
533
534
    
534
 
    PORT_Assert(signCrl != NULL && inCrlInitFile != NULL);
535
535
    if (!signCrl || !inCrlInitFile) {
 
536
        PORT_SetError(SEC_ERROR_INVALID_ARGS);
536
537
        SECU_PrintError(progName, "invalid args for function "
537
538
                        "CreateNewCrl\n");
538
539
        return SECFailure;