← Back to branch summary

~ubuntu-branches/ubuntu/lucid/seamonkey/lucid-security

« back to all changes in this revision

Viewing changes to security/nss/lib/pkcs7/p7local.c

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2008-07-29 21:29:02 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729212902-spm9kpvchp9udwbw
Tags: 1.1.11+nobinonly-0ubuntu1
https://launchpad.net/bugs/218534
* New security upstream release: 1.1.11 (LP: #218534)
  Fixes USN-602-1, USN-619-1, USN-623-1 and USN-629-1
* Refresh diverged patch:
  - update debian/patches/80_security_build.patch
* Fix FTBFS with missing -lfontconfig
  - add debian/patches/11_fix_ftbfs_with_fontconfig.patch
  - update debian/patches/series
* Build with default gcc (hardy: 4.2, intrepid: 4.3)
  - update debian/rules
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/pkcs7/p7local.c
40
40
 * encoding/creation side *and* the decoding/decryption side.  Anything
41
41
 * else should be static routines in the appropriate file.
42
42
 *
43
 
 * $Id: p7local.c,v 1.8 2005/10/03 22:01:56 relyea%netscape.com Exp $
 
43
 * $Id: p7local.c,v 1.8.2.1 2007/05/09 19:05:06 rrelyea%redhat.com Exp $
44
44
 */
45
45
 
46
46
#include "p7local.h"
278
278
    if (needToEncodeAlgid) {
279
279
        rv = PK11_ParamToAlgid(algtag,param,poolp,algid);
280
280
        if(rv != SECSuccess) {
 
281
            PORT_Free (result);
 
282
            SECITEM_FreeItem(param,PR_TRUE);
281
283
            return NULL;
282
284
        }
283
285
    }