diff options
Diffstat (limited to 'lib/softoken/legacydb/pcertdb.c')
| -rw-r--r-- | lib/softoken/legacydb/pcertdb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/softoken/legacydb/pcertdb.c b/lib/softoken/legacydb/pcertdb.c index 488d0f06c..47778190d 100644 --- a/lib/softoken/legacydb/pcertdb.c +++ b/lib/softoken/legacydb/pcertdb.c @@ -4277,7 +4277,6 @@ CreateTrust(void) if (trust) { trustListCount--; trustListHead = trust->next; - trust->next = NULL; } PORT_Assert(trustListCount >= 0); nsslowcert_UnlockFreeList(); @@ -5161,11 +5160,9 @@ nsslowcert_hasTrust(NSSLOWCERTCertTrust *trust) if (trust == NULL) { return PR_FALSE; } - /* if we only have CERTDB__USER and CERTDB_TRUSTED_UNKNOWN bits, then - * we don't have a trust record. */ - return !(((trust->sslFlags & ~(CERTDB_USER | CERTDB_TRUSTED_UNKNOWN)) == 0) && - ((trust->emailFlags & ~(CERTDB_USER | CERTDB_TRUSTED_UNKNOWN)) == 0) && - ((trust->objectSigningFlags & ~(CERTDB_USER | CERTDB_TRUSTED_UNKNOWN)) == 0)); + return !((trust->sslFlags & CERTDB_TRUSTED_UNKNOWN) && + (trust->emailFlags & CERTDB_TRUSTED_UNKNOWN) && + (trust->objectSigningFlags & CERTDB_TRUSTED_UNKNOWN)); } /* |