Index: nss/lib/certhigh/certvfy.c |
=================================================================== |
--- nss/lib/certhigh/certvfy.c (revision 203524) |
+++ nss/lib/certhigh/certvfy.c (working copy) |
@@ -139,7 +139,7 @@ |
*/ |
SECStatus |
CERT_VerifySignedData(CERTSignedData *sd, CERTCertificate *cert, |
- int64 t, void *wincx) |
+ PRTime t, void *wincx) |
{ |
SECKEYPublicKey *pubKey = 0; |
SECStatus rv = SECFailure; |
@@ -163,7 +163,7 @@ |
SECStatus |
SEC_CheckCRL(CERTCertDBHandle *handle,CERTCertificate *cert, |
- CERTCertificate *caCert, int64 t, void * wincx) |
+ CERTCertificate *caCert, PRTime t, void * wincx) |
{ |
return CERT_CheckCRL(cert, caCert, NULL, t, wincx); |
} |
@@ -172,7 +172,7 @@ |
* Find the issuer of a cert. Use the authorityKeyID if it exists. |
*/ |
CERTCertificate * |
-CERT_FindCertIssuer(CERTCertificate *cert, int64 validTime, SECCertUsage usage) |
+CERT_FindCertIssuer(CERTCertificate *cert, PRTime validTime, SECCertUsage usage) |
{ |
NSSCertificate *me; |
NSSTime *nssTime; |
@@ -348,7 +348,7 @@ |
static SECStatus |
cert_VerifyCertChainOld(CERTCertDBHandle *handle, CERTCertificate *cert, |
PRBool checkSig, PRBool* sigerror, |
- SECCertUsage certUsage, int64 t, void *wincx, |
+ SECCertUsage certUsage, PRTime t, void *wincx, |
CERTVerifyLog *log, PRBool* revoked) |
{ |
SECTrustType trustType; |
@@ -365,7 +365,7 @@ |
unsigned int caCertType; |
unsigned int requiredCAKeyUsage; |
unsigned int requiredFlags; |
- PRArenaPool *arena = NULL; |
+ PLArenaPool *arena = NULL; |
CERTGeneralName *namesList = NULL; |
CERTCertificate **certsList = NULL; |
int certsListLen = 16; |
@@ -734,7 +734,7 @@ |
SECStatus |
cert_VerifyCertChain(CERTCertDBHandle *handle, CERTCertificate *cert, |
PRBool checkSig, PRBool* sigerror, |
- SECCertUsage certUsage, int64 t, void *wincx, |
+ SECCertUsage certUsage, PRTime t, void *wincx, |
CERTVerifyLog *log, PRBool* revoked) |
{ |
if (CERT_GetUsePKIXForValidation()) { |
@@ -747,7 +747,7 @@ |
SECStatus |
CERT_VerifyCertChain(CERTCertDBHandle *handle, CERTCertificate *cert, |
- PRBool checkSig, SECCertUsage certUsage, int64 t, |
+ PRBool checkSig, SECCertUsage certUsage, PRTime t, |
void *wincx, CERTVerifyLog *log) |
{ |
return cert_VerifyCertChain(handle, cert, checkSig, NULL, certUsage, t, |
@@ -759,7 +759,7 @@ |
*/ |
SECStatus |
CERT_VerifyCACertForUsage(CERTCertDBHandle *handle, CERTCertificate *cert, |
- PRBool checkSig, SECCertUsage certUsage, int64 t, |
+ PRBool checkSig, SECCertUsage certUsage, PRTime t, |
void *wincx, CERTVerifyLog *log) |
{ |
SECTrustType trustType; |
@@ -1110,7 +1110,7 @@ |
*/ |
SECStatus |
CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert, |
- PRBool checkSig, SECCertificateUsage requiredUsages, int64 t, |
+ PRBool checkSig, SECCertificateUsage requiredUsages, PRTime t, |
void *wincx, CERTVerifyLog *log, SECCertificateUsage* returnedUsages) |
{ |
SECStatus rv; |
@@ -1275,7 +1275,7 @@ |
SECStatus |
CERT_VerifyCert(CERTCertDBHandle *handle, CERTCertificate *cert, |
- PRBool checkSig, SECCertUsage certUsage, int64 t, |
+ PRBool checkSig, SECCertUsage certUsage, PRTime t, |
void *wincx, CERTVerifyLog *log) |
{ |
SECStatus rv; |
@@ -1429,7 +1429,7 @@ |
CERTCertificate * |
CERT_FindMatchingCert(CERTCertDBHandle *handle, SECItem *derName, |
CERTCertOwner owner, SECCertUsage usage, |
- PRBool preferTrusted, int64 validTime, PRBool validOnly) |
+ PRBool preferTrusted, PRTime validTime, PRBool validOnly) |
{ |
CERTCertList *certList = NULL; |
CERTCertificate *cert = NULL; |
@@ -1547,7 +1547,7 @@ |
int n; |
char **names; |
PRBool found; |
- int64 time; |
+ PRTime time; |
if ( nCANames <= 0 ) { |
return(SECSuccess); |
@@ -1623,7 +1623,7 @@ |
* not yet good. |
*/ |
char * |
-CERT_GetCertNicknameWithValidity(PRArenaPool *arena, CERTCertificate *cert, |
+CERT_GetCertNicknameWithValidity(PLArenaPool *arena, CERTCertificate *cert, |
char *expiredString, char *notYetGoodString) |
{ |
SECCertTimeValidity validity; |
@@ -1695,7 +1695,7 @@ |
char *notYetGoodString) |
{ |
CERTCertNicknames *names; |
- PRArenaPool *arena; |
+ PLArenaPool *arena; |
CERTCertListNode *node; |
char **nn; |
@@ -1830,7 +1830,7 @@ |
} |
CERTCertList * |
-CERT_GetCertChainFromCert(CERTCertificate *cert, int64 time, SECCertUsage usage) |
+CERT_GetCertChainFromCert(CERTCertificate *cert, PRTime time, SECCertUsage usage) |
{ |
CERTCertList *chain = NULL; |
int count = 0; |