Skip to content

Commit

Permalink
Bug 1643557 - Use size_t for various counts in pk11slot.c. r=kjacobs
Browse files Browse the repository at this point in the history
Depends on D78451

Differential Revision: https://phabricator.services.mozilla.com/D78452

--HG--
extra : moz-landing-system : lando
  • Loading branch information
jswalden committed Jun 5, 2020
1 parent c203e3c commit 42c9547
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions lib/pk11wrap/pk11slot.c
Expand Up @@ -4,6 +4,9 @@
/*
* Deal with PKCS #11 Slots.
*/

#include <stddef.h>

#include "seccomon.h"
#include "secmod.h"
#include "nssilock.h"
Expand Down Expand Up @@ -1182,7 +1185,7 @@ pk11_ReadProfileList(PK11SlotInfo *slot)
CK_ATTRIBUTE *attrs;
CK_BBOOL cktrue = CK_TRUE;
CK_OBJECT_CLASS oclass = CKO_PROFILE;
int tsize;
size_t tsize;
int objCount;
CK_OBJECT_HANDLE *handles = NULL;
int i;
Expand Down Expand Up @@ -1484,7 +1487,7 @@ pk11_isRootSlot(PK11SlotInfo *slot)
CK_ATTRIBUTE findTemp[1];
CK_ATTRIBUTE *attrs;
CK_OBJECT_CLASS oclass = CKO_NSS_BUILTIN_ROOT_LIST;
int tsize;
size_t tsize;
CK_OBJECT_HANDLE handle;

attrs = findTemp;
Expand Down Expand Up @@ -2613,7 +2616,7 @@ SECStatus
PK11_ResetToken(PK11SlotInfo *slot, char *sso_pwd)
{
unsigned char tokenName[32];
int tokenNameLen;
size_t tokenNameLen;
CK_RV crv;

/* reconstruct the token name */
Expand Down

0 comments on commit 42c9547

Please sign in to comment.