diff options
author | wtchang%redhat.com <devnull@localhost> | 2006-09-01 22:11:21 +0000 |
---|---|---|
committer | wtchang%redhat.com <devnull@localhost> | 2006-09-01 22:11:21 +0000 |
commit | bfd30e12f089ec22dc32afec40cc2f0101ebdf0e (patch) | |
tree | 3a6df4965ae59ee7ea5512066791b3f9e82a9f9d | |
parent | 236ea22154009415e5203859c5173893e4cb1d02 (diff) | |
download | nss-hg-bfd30e12f089ec22dc32afec40cc2f0101ebdf0e.tar.gz |
Bugzilla bug 342582: need to set slotID. Other minor fixes.
Tag: NSS_3_11_BRANCH
-rw-r--r-- | security/nss/cmd/pk11mode/pk11mode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/security/nss/cmd/pk11mode/pk11mode.c b/security/nss/cmd/pk11mode/pk11mode.c index 6b7c93e95..e4e01a4ec 100644 --- a/security/nss/cmd/pk11mode/pk11mode.c +++ b/security/nss/cmd/pk11mode/pk11mode.c @@ -53,9 +53,9 @@ #define LIB_NAME "softokn3.dll" #include "cryptoki.h" #else -#include <prprf.h> +#include "prprf.h" #include "prlink.h" -#include "../../lib/softoken/pkcs11.h" +#include "pkcs11.h" #endif @@ -578,10 +578,12 @@ int main(int argc, char **argv) pC_GetFunctionList = (CK_C_GetFunctionList) PR_FindFunctionSymbol(lib, "FC_GetFunctionList"); assert(pC_GetFunctionList != NULL); + slotID = 0; } else { pC_GetFunctionList = (CK_C_GetFunctionList) PR_FindFunctionSymbol(lib, "C_GetFunctionList"); assert(pC_GetFunctionList != NULL); + slotID = 1; } #endif @@ -824,7 +826,7 @@ int main(int argc, char **argv) FreeLibrary(hModule); #else if (PR_UnloadLibrary(lib) != PR_SUCCESS) { - PKM_Error("unable to unload softoken"); + PKM_Error("unable to unload softoken\n"); } #endif return 0; |