← 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/softoken/legacydb/lowcert.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/softoken/legacydb/lowcert.c
38
38
/*
39
39
 * Certificate handling code
40
40
 *
41
 
 * $Id: lowcert.c,v 1.4 2008/02/08 02:50:50 julien.pierre.boogz%sun.com Exp $
 
41
 * $Id: lowcert.c,v 1.5 2009/04/12 01:31:45 nelson%bolyard.com Exp $
42
42
 */
43
43
 
44
44
#include "seccomon.h"
363
363
        PORT_SetError(SEC_ERROR_INVALID_ARGS);
364
364
        goto loser;
365
365
    }
 
366
    if (len > NSS_MAX_LEGACY_DB_KEY_SIZE) {
 
367
        PORT_SetError(SEC_ERROR_INPUT_LEN);
 
368
        goto loser;
 
369
    }
366
370
    key->data = (unsigned char*)PORT_ArenaAlloc(arena, len);
367
371
    if ( !key->data ) {
368
372
        goto loser;