Bug 402285 - built-in root certs module shows no slot name, r=alexei,kengert

7 files changed, 49 insertions, 48 deletions

diff --git a/security/nss/lib/ckfw/builtins/binst.c b/security/nss/lib/ckfw/builtins/binst.c
index 2d912f4a4..5a825ce0d 100644
--- a/security/nss/lib/ckfw/builtins/binst.c
+++ b/security/nss/lib/ckfw/builtins/binst.c
@@ -121,7 +121,7 @@ builtins_mdInstance_GetSlots
   return CKR_OK;
 }
 
-NSS_IMPLEMENT_DATA const NSSCKMDInstance
+const NSSCKMDInstance
 nss_builtins_mdInstance = {
   (void *)NULL, /* etc */
   NULL, /* Initialize */
diff --git a/security/nss/lib/ckfw/builtins/bslot.c b/security/nss/lib/ckfw/builtins/bslot.c
index ebf951d48..68e92c8bc 100644
--- a/security/nss/lib/ckfw/builtins/bslot.c
+++ b/security/nss/lib/ckfw/builtins/bslot.c
@@ -110,7 +110,7 @@ builtins_mdSlot_GetToken
   return (NSSCKMDToken *)&nss_builtins_mdToken;
 }
 
-NSS_IMPLEMENT_DATA const NSSCKMDSlot
+const NSSCKMDSlot
 nss_builtins_mdSlot = {
   (void *)NULL, /* etc */
   NULL, /* Initialize */
diff --git a/security/nss/lib/ckfw/builtins/btoken.c b/security/nss/lib/ckfw/builtins/btoken.c
index 7808161d9..af05d0b22 100644
--- a/security/nss/lib/ckfw/builtins/btoken.c
+++ b/security/nss/lib/ckfw/builtins/btoken.c
@@ -150,7 +150,7 @@ builtins_mdToken_OpenSession
   return nss_builtins_CreateSession(fwSession, pError);
 }
 
-NSS_IMPLEMENT_DATA const NSSCKMDToken
+const NSSCKMDToken
 nss_builtins_mdToken = {
   (void *)NULL, /* etc */
   NULL, /* Setup */
diff --git a/security/nss/lib/ckfw/builtins/builtins.h b/security/nss/lib/ckfw/builtins/builtins.h
index a3937ac9f..457c75f34 100644
--- a/security/nss/lib/ckfw/builtins/builtins.h
+++ b/security/nss/lib/ckfw/builtins/builtins.h
@@ -64,23 +64,24 @@ struct builtinsInternalObjectStr {
 };
 typedef struct builtinsInternalObjectStr builtinsInternalObject;
 
-NSS_EXTERN_DATA builtinsInternalObject nss_builtins_data[];
-NSS_EXTERN_DATA const PRUint32               nss_builtins_nObjects;
+extern       builtinsInternalObject nss_builtins_data[];
+extern const PRUint32               nss_builtins_nObjects;
 
-NSS_EXTERN_DATA const CK_VERSION   nss_builtins_CryptokiVersion;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_ManufacturerID;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_LibraryDescription;
-NSS_EXTERN_DATA const CK_VERSION   nss_builtins_LibraryVersion;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_SlotDescription;
-NSS_EXTERN_DATA const CK_VERSION   nss_builtins_HardwareVersion;
-NSS_EXTERN_DATA const CK_VERSION   nss_builtins_FirmwareVersion;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenLabel;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenModel;
-NSS_EXTERN_DATA const NSSUTF8 *    nss_builtins_TokenSerialNumber;
+extern const CK_VERSION   nss_builtins_CryptokiVersion;
+extern const CK_VERSION   nss_builtins_LibraryVersion;
+extern const CK_VERSION   nss_builtins_HardwareVersion;
+extern const CK_VERSION   nss_builtins_FirmwareVersion;
 
-NSS_EXTERN_DATA const NSSCKMDInstance nss_builtins_mdInstance;
-NSS_EXTERN_DATA const NSSCKMDSlot     nss_builtins_mdSlot;
-NSS_EXTERN_DATA const NSSCKMDToken    nss_builtins_mdToken;
+extern const NSSUTF8      nss_builtins_ManufacturerID[];
+extern const NSSUTF8      nss_builtins_LibraryDescription[];
+extern const NSSUTF8      nss_builtins_SlotDescription[];
+extern const NSSUTF8      nss_builtins_TokenLabel[];
+extern const NSSUTF8      nss_builtins_TokenModel[];
+extern const NSSUTF8      nss_builtins_TokenSerialNumber[];
+
+extern const NSSCKMDInstance nss_builtins_mdInstance;
+extern const NSSCKMDSlot     nss_builtins_mdSlot;
+extern const NSSCKMDToken    nss_builtins_mdToken;
 
 NSS_EXTERN NSSCKMDSession *
 nss_builtins_CreateSession
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index 8a91d824d..2116fb41b 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -42,15 +42,15 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
-static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
-static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
-static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
+static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_BBOOL ck_true = CK_TRUE;
-static const CK_OBJECT_CLASS cko_data = CKO_DATA;
 static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
-static const CK_BBOOL ck_false = CK_FALSE;
+static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+static const CK_OBJECT_CLASS cko_data = CKO_DATA;
 static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
+static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
+static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
+static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
@@ -16020,7 +16020,7 @@ static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 
-PR_IMPLEMENT_DATA(builtinsInternalObject)
+builtinsInternalObject
 nss_builtins_data[] = {
 #ifdef DEBUG
   { 7, nss_builtins_types_0, nss_builtins_items_0, {NULL} },
@@ -16263,7 +16263,7 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_236, nss_builtins_items_236, {NULL} },
   { 13, nss_builtins_types_237, nss_builtins_items_237, {NULL} }
 };
-PR_IMPLEMENT_DATA(const PRUint32)
+const PRUint32
 #ifdef DEBUG
   nss_builtins_nObjects = 237+1;
 #else
diff --git a/security/nss/lib/ckfw/builtins/certdata.perl b/security/nss/lib/ckfw/builtins/certdata.perl
index 256235cfc..7a9e76ca4 100644
--- a/security/nss/lib/ckfw/builtins/certdata.perl
+++ b/security/nss/lib/ckfw/builtins/certdata.perl
@@ -211,7 +211,7 @@ static const char CVS_ID[] = $cvsid;
 EOD
     ;
 
-while(($a,$b) = each(%constants)) {
+foreach $b (sort values(%constants)) {
   print CFILE $b;
 }
 
@@ -266,7 +266,7 @@ for( $i = 0; $i <= $count; $i++ ) {
   }
 }
 
-print CFILE "\nPR_IMPLEMENT_DATA(builtinsInternalObject)\n";
+print CFILE "\nbuiltinsInternalObject\n";
 print CFILE "nss_builtins_data[] = {\n";
 
 for( $i = 0; $i <= $count; $i++ ) {
@@ -290,7 +290,7 @@ for( $i = 0; $i <= $count; $i++ ) {
 
 print CFILE "};\n";
 
-print CFILE "PR_IMPLEMENT_DATA(const PRUint32)\n";
+print CFILE "const PRUint32\n";
 print CFILE "#ifdef DEBUG\n";
 print CFILE "  nss_builtins_nObjects = $count+1;\n";
 print CFILE "#else\n";
diff --git a/security/nss/lib/ckfw/builtins/constants.c b/security/nss/lib/ckfw/builtins/constants.c
index 6cc62c0e8..53467edd9 100644
--- a/security/nss/lib/ckfw/builtins/constants.c
+++ b/security/nss/lib/ckfw/builtins/constants.c
@@ -56,42 +56,42 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
 #include "nssckbi.h"
 #endif /* NSSCKBI_H */
 
-NSS_IMPLEMENT_DATA const CK_VERSION
+const CK_VERSION
 nss_builtins_CryptokiVersion =  {
 		NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR,
 		NSS_BUILTINS_CRYPTOKI_VERSION_MINOR };
 
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_ManufacturerID = (NSSUTF8 *) "Mozilla Foundation";
-
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_LibraryDescription = (NSSUTF8 *) "NSS Builtin Object Cryptoki Module";
-
-NSS_IMPLEMENT_DATA const CK_VERSION
+const CK_VERSION
 nss_builtins_LibraryVersion = {
 	NSS_BUILTINS_LIBRARY_VERSION_MAJOR,
 	NSS_BUILTINS_LIBRARY_VERSION_MINOR};
 
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_SlotDescription = (NSSUTF8 *) "";
-
-NSS_IMPLEMENT_DATA const CK_VERSION
+const CK_VERSION
 nss_builtins_HardwareVersion = { 
 	NSS_BUILTINS_HARDWARE_VERSION_MAJOR,
 	NSS_BUILTINS_HARDWARE_VERSION_MINOR };
 
-NSS_IMPLEMENT_DATA const CK_VERSION
+const CK_VERSION
 nss_builtins_FirmwareVersion = { 
 	NSS_BUILTINS_FIRMWARE_VERSION_MAJOR,
 	NSS_BUILTINS_FIRMWARE_VERSION_MINOR };
 
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_TokenLabel = (NSSUTF8 *) "Builtin Object Token";
+const NSSUTF8
+nss_builtins_ManufacturerID[] = { "Mozilla Foundation" };
+
+const NSSUTF8
+nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" };
+
+const NSSUTF8
+nss_builtins_SlotDescription[] = { "NSS Builtin Objects" };
+
+const NSSUTF8
+nss_builtins_TokenLabel[] = { "Builtin Object Token" };
 
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_TokenModel = (NSSUTF8 *) "1";
+const NSSUTF8
+nss_builtins_TokenModel[] = { "1" };
 
 /* should this be e.g. the certdata.txt RCS revision number? */
-NSS_IMPLEMENT_DATA const NSSUTF8 *
-nss_builtins_TokenSerialNumber = (NSSUTF8 *) "1";
+const NSSUTF8
+nss_builtins_TokenSerialNumber[] = { "1" };