135532 - trust domains should contain slots, not tokens

Status: NEW

(NSS :: Libraries, enhancement, P2)

Description

[Ian McGreer]

The last of my structural changes to the 3.4 Stan code.  Please see
dev/devutil.c for the implementation of nssSlotList.  Here is the new trust domain:

struct NSSTrustDomainStr {
    PRInt32 refCount;
    NSSArena *arena;
    NSSCallback *defaultCallback;
    struct {
        nssSlotList *forCerts;
        nssSlotList *forCiphers;
        nssSlotList *forTrust;
    } slots;
    nssCertificateCache *cache;
};

This next function extracts a snapshot of slots from the trust domain.  It will
eventually be split into GetSlotsForCerts, GetSlotsForTrust, etc.  The slot list
orders the slots in the configured order.  UpdateLevel is for 4.0 -- it will be
used in conjunction with the 4.0 cache to improve searching.  For now, it can be
ignored.


/* XXX */
static NSSSlot **
nssTrustDomain_GetActiveSlots
(
  NSSTrustDomain *td,
  nssUpdateLevel *updateLevel
)   
{
    /* XXX */
    *updateLevel = 1;
    return nssSlotList_GetSlots(td->slots.forCerts);
}

Here is a snippet showing a trust domain search in action:

    slots = nssTrustDomain_GetActiveSlots(td, &updateLevel);
    if (!slots) {
        goto loser;
    }
    numRemaining = maximumOpt;
    for (slotp = slots; *slotp; slotp++) {
        token = nssSlot_GetToken(*slotp);
        if (token) {
            nssSession *session;
            nssCryptokiObject **instances;
            nssTokenSearchType tokenOnly = nssTokenSearchType_TokenOnly;
            session = nssTrustDomain_GetSessionForToken(td, token);
            if (!session) {
                nssToken_Destroy(token);
                goto loser;
            }
            instances = nssToken_FindCertificatesBySubject(token,
                                                           session,
                                                           subject,
                                                           tokenOnly,
                                                           numRemaining,
                                                           &status);

Comment 1

[Ian McGreer]

Fix the summary.  Also, in case you didn't guess, nssSlot_GetToken returns NULL
if the token is not present.

Comment 2

[Ian McGreer]

Attachment: change trust domain to use nssSlotList

here's a patch against the current tip.

Comment 3

[Wan-Teh Chang]

Changed the QA contact to Bishakha.

Comment 4

[Wan-Teh Chang]

Target NSS 3.5, priority P2.

Ian told me that the implementation of nssSlotList
is already checked in, and does not show up in the
patch.  You will have to review it separately,
dev/devutil.c.

Comment 5

[Wan-Teh Chang]

Ian, you haven't fixed this, have you?

Comment 6

[Ian McGreer]

Yes.  In 3.5.

Comment 7

[Wan-Teh Chang]

Could you explain how you fixed this?  The patch you attached
hasn't been checked in.  Did you check in a different patch?

Comment 8

[Ian McGreer]

*sigh*

Good point.

I guess this bug dropped off my radar.  What the tip currently does is iterate
over slots,a s it should.  This bug was to have trust domains actually store
slots, instead of tokens.  I thought that had been done.

Instead, the struct NSSTrustDomain shown below is #ifdef'ed out.  The
nssSlotList described below is not in use.

Retargeting for 3.7.  It should be a simple matter of turning on the new struct
definition, and a couple other small changes (I believe the patch will not apply
as-is).  But we should make that change early on in 3.7, as a precursor to 4.0
(since 4.0 will use the same definition).

This isn't a big miss for 3.6, it's just a minor enhancement.

Comment 9

[Wan-Teh Chang]

Moved to target milestone 3.8 because the original
NSS 3.7 release has been renamed 3.8.

Comment 10

[Nelson Bolyard (seldom reads bugmail)]

Remove target milestone of 3.8, since these bugs didn't get into that release.