← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/cmd/p7env/p7env.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/cmd/p7env/p7env.c
37
37
/*
38
38
 * p7env -- A command to create a pkcs7 enveloped data.
39
39
 *
40
 
 * $Id: p7env.c,v 1.9 2008/08/08 23:47:56 julien.pierre.boogz%sun.com Exp $
 
40
 * $Id: p7env.c,v 1.10 2010/02/11 02:39:47 wtc%google.com Exp $
41
41
 */
42
42
 
43
43
#include "nspr.h"
61
61
extern int fprintf(FILE *, char *, ...);
62
62
#endif
63
63
 
64
 
extern void SEC_Init(void);             /* XXX */
65
 
 
66
64
 
67
65
static void
68
66
Usage(char *progName)