Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 217024 . Address Wan-Teh's concerns about naming and documentation. Also fix AIX build by removing extraneous comma.

Browse Source
This commit is contained in:
julien.pierre.bugs%sun.com 2005-07-09 00:34:43 +00:00
parent b53a2f0389
commit 26dff248b1
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
security/nss/lib/certdb/certdb.c
View File

@ -38,7 +38,7 @@
/*
* Certificate handling code
*
* $Id: certdb.c,v 1.74 2005/07/08 07:06:55 julien.pierre.bugs%sun.com Exp $
* $Id: certdb.c,v 1.75 2005/07/09 00:34:43 julien.pierre.bugs%sun.com Exp $
*/
#include "nssilock.h"
@ -1913,47 +1913,47 @@ CERT_IsRootDERCert(SECItem *derCert)
return isRoot;
}
static CERT_CompareValidityStatus GetNewestTime(PRTime a, PRTime b)
static CERTCompareValidityStatus GetNewestTime(PRTime a, PRTime b)
{
if ( LL_CMP (a, == , b) ) {
return ValidityEqual;
return certValidityEqual;
} else if (LL_CMP(a, >, b)) {
return ValidityChooseA;
return certValidityChooseA;
} else {
return ValidityChooseB;
return certValidityChooseB;
}
}
CERT_CompareValidityStatus
CERTCompareValidityStatus
CERT_CompareValidityTimes(CERTValidity* val_a, CERTValidity* val_b)
{
PRTime notBeforeA, notBeforeB, notAfterA, notAfterB;
SECStatus rv;
CERT_CompareValidityStatus afterStatus, beforeStatus;
CERTCompareValidityStatus afterStatus, beforeStatus;
if (!val_a || !val_b)
{
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return ValidityUndetermined;
return certValidityUndetermined;
}
if ( SECSuccess != DER_DecodeTimeChoice(&notBeforeA, &val_a->notBefore) ||
SECSuccess != DER_DecodeTimeChoice(&notBeforeB, &val_b->notBefore) ||
SECSuccess != DER_DecodeTimeChoice(&notAfterA, &val_a->notAfter) ||
SECSuccess != DER_DecodeTimeChoice(&notAfterB, &val_b->notAfter) ) {
return ValidityUndetermined;
return certValidityUndetermined;
}
/* sanity check */
if (ValidityChooseA == GetNewestTime(notBeforeA, notAfterA) ||
ValidityChooseA == GetNewestTime(notBeforeB, notAfterB)) {
if (certValidityChooseA == GetNewestTime(notBeforeA, notAfterA) ||
certValidityChooseA == GetNewestTime(notBeforeB, notAfterB)) {
PORT_SetError(SEC_ERROR_INVALID_TIME);
return ValidityUndetermined;
return certValidityUndetermined;
}
beforeStatus = GetNewestTime(notBeforeA, notBeforeB);
afterStatus = GetNewestTime(notAfterA, notAfterB);
if (afterStatus != ValidityEqual) {
if (afterStatus != certValidityEqual) {
/* one cert validity goes farthest into the future, select it */
return afterStatus;
}

6
security/nss/lib/certdb/certdb.h
View File

@ -158,8 +158,10 @@ SEC_CheckCRL(PCERTCertDBHandle *handle,PCERTCertificate *cert,
SECStatus
SEC_CrlReplaceUrl(PCERTSignedCrl *crl,char *url);
/* compare two certificate validity structures */
CERT_CompareValidityStatus
/* Compare two certificate validity structures and return an enum indicating
** which is the newest one.
*/
CERTCompareValidityStatus
CERT_CompareValidityTimes(CERTValidity* val_a, CERTValidity* val_b);
#endif

19
security/nss/lib/certdb/certt.h
View File

@ -36,7 +36,7 @@
/*
* certt.h - public data structures for the certificate library
*
* $Id: certt.h,v 1.31 2005/07/08 07:06:55 julien.pierre.bugs%sun.com Exp $
* $Id: certt.h,v 1.32 2005/07/09 00:34:43 julien.pierre.bugs%sun.com Exp $
*/
#ifndef _CERTT_H_
#define _CERTT_H_
@ -522,13 +522,18 @@ typedef enum SECCertTimeValidityEnum {
cert, most likely because it was NULL */
} SECCertTimeValidity;
typedef enum CERT_CompareValidityStatusType
/*
* This is used with CERT_CompareValidityTimes when comparing the validity
* periods of two certificates A and B.
*/
typedef enum CERTCompareValidityStatusEnum
{
ValidityUndetermined = 0,
ValidityChooseB = 1,
ValidityEqual = 2,
ValidityChooseA = 3,
} CERT_CompareValidityStatus;
certValidityUndetermined = 0,
certValidityChooseB = 1,
certValidityEqual = 2,
certValidityChooseA = 3
} CERTCompareValidityStatus;
/*
* Interface for getting certificate nickname strings out of the database