Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11auth.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * This file deals with PKCS #11 passwords and authentication.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
@@ skipping 34 matching lines @@
  * Check the user's password. Log into the card if it's correct.
  * succeed if the user is already logged in.
  */
 static SECStatus
 pk11_CheckPassword(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
                         char *pw, PRBool alreadyLocked, PRBool contextSpecific)
 {
     int len = 0;
     CK_RV crv;
     SECStatus rv;
-    int64 currtime = PR_Now();
+    PRTime currtime = PR_Now();
     PRBool mustRetry;
     int retry = 0;
 
     if (slot->protectedAuthPath) {
         len = 0;
         pw = NULL;
     } else if (pw == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     } else {
@@ skipping 59 matching lines @@
 /*
  * Check the user's password. Logout before hand to make sure that
  * we are really checking the password.
  */
 SECStatus
 PK11_CheckUserPassword(PK11SlotInfo *slot, const char *pw)
 {
     int len = 0;
     CK_RV crv;
     SECStatus rv;
-    int64 currtime = PR_Now();
+    PRTime currtime = PR_Now();
 
     if (slot->protectedAuthPath) {
         len = 0;
         pw = NULL;
     } else if (pw == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     } else {
         len = PORT_Strlen(pw);
     }
@@ skipping 585 matching lines @@
             PK11_FreeSlot(def_slot);
         }
     }
 
     if ((wincx != NULL) && (PK11_Global.isLoggedIn != NULL) &&
         (*PK11_Global.isLoggedIn)(slot, wincx) == PR_FALSE) { return PR_FALSE; }
 
 
     /* forget the password if we've been inactive too long */
     if (askpw == 1) {
-        int64 currtime = PR_Now();
-        int64 result;
-        int64 mult;
+        PRTime currtime = PR_Now();
+        PRTime result;
+        PRTime mult;
         
         LL_I2L(result, timeout);
         LL_I2L(mult, 60*1000*1000);
         LL_MUL(result,result,mult);
         LL_ADD(result, result, slot->authTime);
         if (LL_CMP(result, <, currtime) ) {
             PK11_EnterSlotMonitor(slot);
             PK11_GETTAB(slot)->C_Logout(slot->session);
             slot->lastLoginCheck = 0;
             PK11_ExitSlotMonitor(slot);
@@ skipping 25 matching lines @@
     case CKS_RO_PUBLIC_SESSION:
     default:
         break; /* fail */
     case CKS_RW_USER_FUNCTIONS:
     case CKS_RW_SO_FUNCTIONS:
     case CKS_RO_USER_FUNCTIONS:
         return PR_TRUE;
     }
     return PR_FALSE; 
 }