Beonex Communicator 0.9-pre (based on Mozilla 1.1) branch BEONEX_0_9_BRANCH (based on MOZILLA_1_1_BRANCH) BEONEX_0_9_BRANCH
authormozilla.BenB%bucksch.org
Thu, 29 Aug 2002 01:33:08 +0000
branchBEONEX_0_9_BRANCH
changeset 3507 fefffc8e60096660b319f893d46f053ab276b6b4
parent 3393 4d855a9ea29e8edfbaa04d85d76d960b1d307efe (current diff)
parent 3394 e81ba1d2709b93396ccecf65cb32ed12781a5c72 (diff)
child 10642 37b4956b392d6840175e1f3ff5feb16c6c61cda5
push idunknown
push userunknown
push dateunknown
Beonex Communicator 0.9-pre (based on Mozilla 1.1) branch BEONEX_0_9_BRANCH (based on MOZILLA_1_1_BRANCH)
security/nss/cmd/modutil/specification.html
security/nss/lib/softoken/pkcs11.c
--- a/security/nss/cmd/modutil/specification.html
+++ b/security/nss/cmd/modutil/specification.html
@@ -134,17 +134,17 @@ following mechanisms are currently avail
 [-pwfile <u><i>old password file</i></u>]
 [-newpwfile <u><i>new password file</i></u>]</code></td>
 <td>Changes the password on the named token.  If the token has not been
 initialized, this command will initialize the PIN.
 If a password file is given, the password will be read from that file;
 otherwise, the password will be obtained interactively.
 <b>Storing passwords in a file is much less secure than supplying them
 interactively.</b>
-<p>The password on the Netscape internal module cannot be changed if
+<p>The password on the NSS internal module cannot be changed if
 the <code>-nocertdb</code> option is specified.
 </td>
 </tr>
 
 <!-------------------------- -create ------------------------------------->
 <tr>
 <td><a name="create"></a><code>-create</code></td>
 <td>Creates a new secmod[ule].db, key3.db, and cert7.db in the directory
@@ -235,69 +235,69 @@ file will not be checked.</td>
 database.
 <blockquote>
 <pre>
 % <b>modutil -list</b>
 Using database directory /u/nicolson/.netscape...
 
 Listing of PKCS #11 Modules
 -----------------------------------------------------------
-  1. Netscape Internal PKCS #11 Module
+  1. NSS Internal PKCS #11 Module
          slots: 2 slots attached
         status: loaded
 
          slot: Communicator Internal Cryptographic Services Version 4.0
         token: Communicator Generic Crypto Svcs
 
          slot: Communicator User Private Key and Certificate Services
         token: Communicator Certificate DB
 -----------------------------------------------------------
 </pre>
 </blockquote>
 <p>With an argument, provides a detailed description of the named module
 and its slots and tokens.
 <blockquote>
 <pre>
-% <b>modutil -list "Netscape Internal PKCS #11 Module"</b>
+% <b>modutil -list "NSS Internal PKCS #11 Module"</b>
 Using database directory /u/nicolson/.netscape...
 
 -----------------------------------------------------------
-Name: Netscape Internal PKCS #11 Module
+Name: NSS Internal PKCS #11 Module
 Library file: **Internal ONLY module**
-Manufacturer: Netscape Communications Corp    
+Manufacturer: mozilla.org
 Description: Communicator Internal Crypto Svc
 PKCS #11 Version 2.0
 Library Version: 4.0
 Cipher Enable Flags: None
 Default Mechanism Flags: RSA:DSA:RC2:RC4:DES:SHA1:MD5:MD2
 
   Slot: Communicator Internal Cryptographic Services Version 4.0
-  Manufacturer: Netscape Communications Corp    
+  Manufacturer: mozilla.org
   Type: Software
   Version Number: 4.1
   Firmware Version: 0.0
   Status: Enabled
   Token Name: Communicator Generic Crypto Svcs
-  Token Manufacturer: Netscape Communications Corp    
+  Token Manufacturer: mozilla.org
   Token Model: Libsec 4.0      
   Token Serial Number: 0000000000000000
   Token Version: 4.0
   Token Firmware Version: 0.0
   Access: Write Protected
   Login Type: Public (no login required)
   User Pin: NOT Initialized
 
   Slot: Communicator User Private Key and Certificate Services
-  Manufacturer: Netscape Communications Corp    
+  Manufacturer: mozilla.org
   Type: Software
   Version Number: 3.0
   Firmware Version: 0.0
   Status: Enabled
   Token Name: Communicator Certificate DB     
-  Token Manufacturer: Netscape Communications Corp    
+  Token Manufacturer: mozilla.org
   Token Model: Libsec 4.0      
   Token Serial Number: 0000000000000000
   Token Version: 7.0
   Token Firmware Version: 0.0
   Access: NOT Write Protected
   Login Type: Login required
   User Pin: Initialized
 
@@ -335,17 +335,17 @@ no default, and this option must be used
 
 <!------------------------------ -dbdir ---------------------------------->
 <tr>
 <td><code>-nocertdb</code></td>
 <td>Do not open the certificate or key databases.  This has several effects.
 With the <code>-create</code> command, this means that only a secmod.db file
 will be created; cert7.db and key3.db will not be created.  With the
 <code>-jar</code> command, signatures on the JAR file will not be checked.
-With the <code>-changepw</code> command, the password on the Netscape internal 
+With the <code>-changepw</code> command, the password on the NSS internal 
 module cannot be set or changed, since this password is stored in key3.db.
 </td>
 </tr>
 
 </table>
 
 </body>
 </html>
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -2041,17 +2041,17 @@ pk11_getDefSlotName(CK_SLOT_ID slotID)
     case NETSCAPE_SLOT_ID:
 	return 
 	 "NSS Internal Cryptographic Services Version 3.4                 ";
     case PRIVATE_KEY_SLOT_ID:
 	return 
 	 "NSS User Private Key and Certificate Services                   ";
     case FIPS_SLOT_ID:
         return 
-         "Netscape FIPS-140-1 User Private Key Services                   ";
+         "NSS FIPS-140-1 User Private Key Services                        ";
     default:
 	break;
     }
     sprintf(buf,
      "NSS Application Slot %08x                                   ",
 							(unsigned int) slotID);
     return buf;
 }