~ubuntu-branches/ubuntu/karmic/seamonkey/karmic

« back to all changes in this revision

Viewing changes to security/nss/lib/ckfw/builtins/builtins.h

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2008-03-27 00:31:02 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080327003102-u1cumb16etfzcavm
Tags: 1.1.9+nobinonly-0ubuntu1
* New security upstream release: 1.1.9 (LP: #207461)
* Security fixes:
  - MFSA 2008-19 XUL popup spoofing variant (cross-tab popups)
  - MFSA 2008-18 Java socket connection to any local port via LiveConnect
  - MFSA 2008-17 Privacy issue with SSL Client Authentication
  - MFSA 2008-16 HTTP Referrer spoofing with malformed URLs
  - MFSA 2008-15 Crashes with evidence of memory corruption
  - MFSA 2008-14 JavaScript privilege escalation and arbitrary code execution
* Drop patches applied upstream:
  - drop debian/patches/11_bz399589_fix_missing_symbol_with_new_nss.patch
  - update debian/patches/series
* Add missing Ubuntu-specific menu items (LP: #190845)
  - add debian/patches/85_ubuntu_menu.patch
  - update debian/patches/series
  Contributed by Andrea Colangelo <warp10@libero.it>

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
 * ***** END LICENSE BLOCK ***** */
36
36
 
37
37
#ifdef DEBUG
38
 
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.5 $ $Date: 2005/01/20 02:25:46 $";
 
38
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.5.28.1 $ $Date: 2008/01/24 21:16:51 $";
39
39
#endif /* DEBUG */
40
40
 
41
41
#include "nssckmdt.h"
64
64
};
65
65
typedef struct builtinsInternalObjectStr builtinsInternalObject;
66
66
 
67
 
NSS_EXTERN_DATA builtinsInternalObject nss_builtins_data[];
68
 
NSS_EXTERN_DATA const PRUint32               nss_builtins_nObjects;
69
 
 
70
 
NSS_EXTERN_DATA const CK_VERSION   nss_builtins_CryptokiVersion;
71
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_ManufacturerID;
72
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_LibraryDescription;
73
 
NSS_EXTERN_DATA const CK_VERSION   nss_builtins_LibraryVersion;
74
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_SlotDescription;
75
 
NSS_EXTERN_DATA const CK_VERSION   nss_builtins_HardwareVersion;
76
 
NSS_EXTERN_DATA const CK_VERSION   nss_builtins_FirmwareVersion;
77
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenLabel;
78
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenModel;
79
 
NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenSerialNumber;
80
 
 
81
 
NSS_EXTERN_DATA const NSSCKMDInstance nss_builtins_mdInstance;
82
 
NSS_EXTERN_DATA const NSSCKMDSlot     nss_builtins_mdSlot;
83
 
NSS_EXTERN_DATA const NSSCKMDToken    nss_builtins_mdToken;
 
67
extern       builtinsInternalObject nss_builtins_data[];
 
68
extern const PRUint32               nss_builtins_nObjects;
 
69
 
 
70
extern const CK_VERSION   nss_builtins_CryptokiVersion;
 
71
extern const CK_VERSION   nss_builtins_LibraryVersion;
 
72
extern const CK_VERSION   nss_builtins_HardwareVersion;
 
73
extern const CK_VERSION   nss_builtins_FirmwareVersion;
 
74
 
 
75
extern const NSSUTF8      nss_builtins_ManufacturerID[];
 
76
extern const NSSUTF8      nss_builtins_LibraryDescription[];
 
77
extern const NSSUTF8      nss_builtins_SlotDescription[];
 
78
extern const NSSUTF8      nss_builtins_TokenLabel[];
 
79
extern const NSSUTF8      nss_builtins_TokenModel[];
 
80
extern const NSSUTF8      nss_builtins_TokenSerialNumber[];
 
81
 
 
82
extern const NSSCKMDInstance nss_builtins_mdInstance;
 
83
extern const NSSCKMDSlot     nss_builtins_mdSlot;
 
84
extern const NSSCKMDToken    nss_builtins_mdToken;
84
85
 
85
86
NSS_EXTERN NSSCKMDSession *
86
87
nss_builtins_CreateSession