← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/pk11wrap/pk11func.h

  • 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/pk11wrap/pk11func.h
37
37
#define _PK11FUNC_H_
38
38
 
39
39
/*
40
 
 * the original pk11func.h had a mix of public and private functions.
41
 
 * continue to provide those for backward compatibility.
 
40
 * The original pk11func.h had a mix of public and private functions.
 
41
 * Continue to provide those for backward compatibility.  New code should
 
42
 * include pk11pub.h instead of pk11func.h.
42
43
 */
43
44
#include "pk11pub.h"
44
45
#include "pk11priv.h"