diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/cmd/modutil/pk11.c | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/cmd/modutil/pk11.c')
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index 9c460ecd8..834469af1 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/security/nss/cmd/modutil/pk11.c @@ -397,6 +397,7 @@ static void printModule(SECMODModule *module, int *count) { int slotCount = module->loaded ? module->slotCount : 0; + char *modUri; int i; if ((*count)++) { @@ -408,6 +409,11 @@ printModule(SECMODModule *module, int *count) PR_fprintf(PR_STDOUT, "\tlibrary name: %s\n", module->dllName); } + modUri = PK11_GetModuleURI(module); + if (modUri) { + PR_fprintf(PR_STDOUT, "\t uri: %s\n", modUri); + PORT_Free(modUri); + } if (slotCount == 0) { PR_fprintf(PR_STDOUT, "\t slots: There are no slots attached to this module\n"); @@ -425,10 +431,12 @@ printModule(SECMODModule *module, int *count) /* Print slot and token names */ for (i = 0; i < slotCount; i++) { PK11SlotInfo *slot = module->slots[i]; - + char *tokenUri = PK11_GetTokenURI(slot); PR_fprintf(PR_STDOUT, "\n"); PR_fprintf(PR_STDOUT, "\t slot: %s\n", PK11_GetSlotName(slot)); PR_fprintf(PR_STDOUT, "\ttoken: %s\n", PK11_GetTokenName(slot)); + PR_fprintf(PR_STDOUT, "\t uri: %s\n", tokenUri); + PORT_Free(tokenUri); } return; } @@ -494,7 +502,7 @@ static char *disableReasonStr[] = { "could not verify token", "token not present" }; -static int numDisableReasonStr = +static size_t numDisableReasonStr = sizeof(disableReasonStr) / sizeof(disableReasonStr[0]); /*********************************************************************** @@ -513,7 +521,7 @@ ListModule(char *moduleName) CK_SLOT_INFO slotinfo; CK_TOKEN_INFO tokeninfo; char *ciphers, *mechanisms; - PK11DisableReasons reason; + size_t reasonIdx; Error rv = SUCCESS; if (!moduleName) { @@ -604,10 +612,10 @@ ListModule(char *moduleName) PR_fprintf(PR_STDOUT, PAD "Firmware Version: %d.%d\n", slotinfo.firmwareVersion.major, slotinfo.firmwareVersion.minor); if (PK11_IsDisabled(slot)) { - reason = PK11_GetDisabledReason(slot); - if (reason < numDisableReasonStr) { + reasonIdx = PK11_GetDisabledReason(slot); + if (reasonIdx < numDisableReasonStr) { PR_fprintf(PR_STDOUT, PAD "Status: DISABLED (%s)\n", - disableReasonStr[reason]); + disableReasonStr[reasonIdx]); } else { PR_fprintf(PR_STDOUT, PAD "Status: DISABLED\n"); } |