← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ckfw/nssmkey/mobject.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/lib/ckfw/nssmkey/mobject.c
36
36
 *
37
37
 * ***** END LICENSE BLOCK ***** */
38
38
#ifdef DEBUG
39
 
static const char CVS_ID[] = "@(#) $RCSfile: mobject.c,v $ $Revision: 1.3 $ $Date: 2007/10/12 01:44:42 $";
 
39
static const char CVS_ID[] = "@(#) $RCSfile: mobject.c,v $ $Revision: 1.4 $ $Date: 2009/02/25 18:38:04 $";
40
40
#endif /* DEBUG */
41
41
 
42
42
#include "ckmk.h"
132
132
static const NSSItem ckmk_falseItem = { 
133
133
  (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) };
134
134
static const NSSItem ckmk_x509Item = { 
135
 
  (void *)&ckc_x509, (PRUint32)sizeof(CKC_X_509) };
 
135
  (void *)&ckc_x509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) };
136
136
static const NSSItem ckmk_rsaItem = { 
137
137
  (void *)&ckk_rsa, (PRUint32)sizeof(CK_KEY_TYPE) };
138
138
static const NSSItem ckmk_certClassItem = {