diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
| commit | 225703849bf43ff466e4dcfd3b68c30486e8ad12 (patch) | |
| tree | a6970da1dad182eb7e0d6a346cec7bb89205a789 /lib/dev | |
| parent | df18e4c7e5e9ad31fab45575896fba7d2bc24250 (diff) | |
| download | nss-hg-225703849bf43ff466e4dcfd3b68c30486e8ad12.tar.gz | |
Backed out changeset 4355f55afeb2 (Bug 1158489)
Diffstat (limited to 'lib/dev')
| -rw-r--r-- | lib/dev/devslot.c | 3 | ||||
| -rw-r--r-- | lib/dev/devtoken.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c index f49915ee1..d97cbba32 100644 --- a/lib/dev/devslot.c +++ b/lib/dev/devslot.c @@ -25,6 +25,9 @@ /* measured as interval */ static PRIntervalTime s_token_delay_time = 0; +/* The flags needed to open a read-only session. */ +static const CK_FLAGS s_ck_readonly_flags = CKF_SERIAL_SESSION; + NSS_IMPLEMENT PRStatus nssSlot_Destroy ( NSSSlot *slot diff --git a/lib/dev/devtoken.c b/lib/dev/devtoken.c index 7223e489b..b6032812f 100644 --- a/lib/dev/devtoken.c +++ b/lib/dev/devtoken.c @@ -1466,6 +1466,7 @@ nssToken_TraverseCertificates ( CK_ATTRIBUTE cert_template[2]; CK_ULONG ctsize; NSSArena *arena; + PRStatus status; PRUint32 arraySize, numHandles; nssCryptokiObject **objects; void *epv = nssToken_GetCryptokiEPV(token); @@ -1543,7 +1544,7 @@ nssToken_TraverseCertificates ( if (objects) { nssCryptokiObject **op; for (op = objects; *op; op++) { - (void)(*callback)(*op, arg); + status = (*callback)(*op, arg); } nss_ZFreeIf(objects); } |