Fix for 172732. r=relyea
authorjpierre%netscape.com
Tue, 08 Oct 2002 01:23:09 +0000
changeset 3691 c19e5de3d9f4423ca428c5aa5b28cd76c616d6f4
parent 3689 fda3c3e075ac3a03f47a389d3fd5c20065f67445
child 3692 9935589eb856ab237face641c69bf2210983bbc0
push idunknown
push userunknown
push dateunknown
reviewersrelyea
bugs172732
Fix for 172732. r=relyea
security/nss/lib/softoken/pkcs11.c
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -2647,17 +2647,17 @@ CK_RV  NSC_GetInfo(CK_INFO_PTR pInfo)
 {
     volatile char c; /* force a reference that won't get optimized away */
 
     c = __nss_softokn_rcsid[0] + __nss_softokn_sccsid[0]; 
     pInfo->cryptokiVersion.major = 2;
     pInfo->cryptokiVersion.minor = 11;
     PORT_Memcpy(pInfo->manufacturerID,manufacturerID,32);
     pInfo->libraryVersion.major = 3;
-    pInfo->libraryVersion.minor = 2;
+    pInfo->libraryVersion.minor = 6;
     PORT_Memcpy(pInfo->libraryDescription,libraryDescription,32);
     pInfo->flags = 0;
     return CKR_OK;
 }
 
 
 /* NSC_GetSlotList obtains a list of slots in the system. */
 CK_RV nsc_CommonGetSlotList(CK_BBOOL tokenPresent, 
@@ -2688,17 +2688,17 @@ CK_RV NSC_GetSlotInfo(CK_SLOT_ID slotID,
     pInfo->firmwareVersion.major = 0;
     pInfo->firmwareVersion.minor = 0;
     PORT_Memcpy(pInfo->manufacturerID,manufacturerID,32);
     PORT_Memcpy(pInfo->slotDescription,slot->slotDescription,64);
     pInfo->flags = CKF_TOKEN_PRESENT;
     /* ok we really should read it out of the keydb file. */
     /* pInfo->hardwareVersion.major = NSSLOWKEY_DB_FILE_VERSION; */
     pInfo->hardwareVersion.major = 3;
-    pInfo->hardwareVersion.minor = 4;
+    pInfo->hardwareVersion.minor = 6;
     return CKR_OK;
 }
 
 #define CKF_THREAD_SAFE 0x8000 /* for now */
 
 /* NSC_GetTokenInfo obtains information about a particular token in 
  * the system. */
 CK_RV NSC_GetTokenInfo(CK_SLOT_ID slotID,CK_TOKEN_INFO_PTR pInfo)