summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bltest/blapitest.c8
-rw-r--r--cmd/httpserv/httpserv.c5
-rw-r--r--cmd/lib/secutil.c6
-rw-r--r--cmd/nss-policy-check/nss-policy-check.c12
-rw-r--r--cmd/pk11mode/pk11mode.c12
-rw-r--r--cmd/selfserv/selfserv.c4
-rw-r--r--cmd/signtool/certgen.c22
7 files changed, 39 insertions, 30 deletions
diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
index f0e3d3dff..0b86075b7 100644
--- a/cmd/bltest/blapitest.c
+++ b/cmd/bltest/blapitest.c
@@ -3047,7 +3047,7 @@ get_params(PLArenaPool *arena, bltestParams *params,
snprintf(filename, sizeof(filename), "%s/tests/%s/%s%d", testdir, modestr, "key", j);
load_file_data(arena, &params->sk.key, filename, bltestBinary);
snprintf(filename, sizeof(filename), "%s/tests/%s/%s%d", testdir, modestr,
- "params", j);
+ "params", j);
file = fopen(filename, "r");
if (!file)
return;
@@ -3255,12 +3255,12 @@ blapi_selftest(bltestCipherMode *modes, int numModes, int inoff, int outoff,
}
for (j = 0; j < numtests; j++) {
snprintf(filename, sizeof(filename), "%s/tests/%s/%s%d", testdir, modestr,
- "plaintext", j);
+ "plaintext", j);
load_file_data(arena, &pt, filename,
is_sigCipher(mode) ? bltestBase64Encoded
: bltestBinary);
snprintf(filename, sizeof(filename), "%s/tests/%s/%s%d", testdir, modestr,
- "ciphertext", j);
+ "ciphertext", j);
load_file_data(arena, &ct, filename, bltestBase64Encoded);
get_params(arena, params, mode, j);
@@ -3871,7 +3871,7 @@ main(int argc, char **argv)
/* Do FIPS self-test */
if (bltest.commands[cmd_FIPS].activated) {
- CK_RV ckrv = sftk_FIPSEntryOK();
+ CK_RV ckrv = sftk_FIPSEntryOK(PR_FALSE);
fprintf(stdout, "CK_RV: %ld.\n", ckrv);
PORT_Free(cipherInfo);
if (ckrv == CKR_OK)
diff --git a/cmd/httpserv/httpserv.c b/cmd/httpserv/httpserv.c
index b4e4736ff..58014ac50 100644
--- a/cmd/httpserv/httpserv.c
+++ b/cmd/httpserv/httpserv.c
@@ -37,7 +37,6 @@
#include "ocspti.h"
#include "ocspi.h"
-
#ifndef PORT_Strstr
#define PORT_Strstr strstr
#endif
@@ -816,14 +815,14 @@ handle_connection(
numIOVs++;
} else if (reqLen <= 0) { /* hit eof */
snprintf(msgBuf, sizeof(msgBuf), "Get or Post incomplete after %d bytes.\r\n",
- bufDat);
+ bufDat);
iovs[numIOVs].iov_base = msgBuf;
iovs[numIOVs].iov_len = PORT_Strlen(msgBuf);
numIOVs++;
} else if (reqLen < bufDat) {
snprintf(msgBuf, sizeof(msgBuf), "Discarded %d characters.\r\n",
- bufDat - reqLen);
+ bufDat - reqLen);
iovs[numIOVs].iov_base = msgBuf;
iovs[numIOVs].iov_len = PORT_Strlen(msgBuf);
diff --git a/cmd/lib/secutil.c b/cmd/lib/secutil.c
index a290b8f7a..de10ce918 100644
--- a/cmd/lib/secutil.c
+++ b/cmd/lib/secutil.c
@@ -234,14 +234,14 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
switch (pwdata->source) {
case PW_NONE:
snprintf(prompt, sizeof(prompt), "Enter Password or Pin for \"%s\":",
- PK11_GetTokenName(slot));
+ PK11_GetTokenName(slot));
return SECU_GetPasswordString(NULL, prompt);
case PW_FROMFILE:
return SECU_FilePasswd(slot, retry, pwdata->data);
case PW_EXTERNAL:
snprintf(prompt, sizeof(prompt),
- "Press Enter, then enter PIN for \"%s\" on external device.\n",
- PK11_GetTokenName(slot));
+ "Press Enter, then enter PIN for \"%s\" on external device.\n",
+ PK11_GetTokenName(slot));
char *pw = SECU_GetPasswordString(NULL, prompt);
PORT_Free(pw);
/* Fall Through */
diff --git a/cmd/nss-policy-check/nss-policy-check.c b/cmd/nss-policy-check/nss-policy-check.c
index 0a77d7c7a..b806dfba6 100644
--- a/cmd/nss-policy-check/nss-policy-check.c
+++ b/cmd/nss-policy-check/nss-policy-check.c
@@ -221,12 +221,12 @@ breakout:
}
snprintf(moduleSpec, sizeof(moduleSpec),
- "name=\"Policy File\" "
- "parameters=\"configdir='sql:%s' "
- "secmod='%s' "
- "flags=readOnly,noCertDB,forceSecmodChoice,forceOpen\" "
- "NSS=\"flags=%s\"",
- path, filename, flags);
+ "name=\"Policy File\" "
+ "parameters=\"configdir='sql:%s' "
+ "secmod='%s' "
+ "flags=readOnly,noCertDB,forceSecmodChoice,forceOpen\" "
+ "NSS=\"flags=%s\"",
+ path, filename, flags);
module = SECMOD_LoadModule(moduleSpec, NULL, PR_TRUE);
if (!module || !module->loaded || atoi(PR_GetEnvSecure("NSS_POLICY_LOADED")) != 1) {
diff --git a/cmd/pk11mode/pk11mode.c b/cmd/pk11mode/pk11mode.c
index e761d5e65..caf1f90a8 100644
--- a/cmd/pk11mode/pk11mode.c
+++ b/cmd/pk11mode/pk11mode.c
@@ -322,6 +322,7 @@ main(int argc, char **argv)
CK_FUNCTION_LIST_PTR pFunctionList;
CK_RV crv = CKR_OK;
CK_C_INITIALIZE_ARGS_NSS initArgs;
+ CK_C_INITIALIZE_ARGS_NSS initArgsRerun; /* rerun selftests */
CK_SLOT_ID *pSlotList = NULL;
CK_TOKEN_INFO tokenInfo;
CK_ULONG slotID = 0; /* slotID == 0 for FIPSMODE */
@@ -329,6 +330,7 @@ main(int argc, char **argv)
CK_UTF8CHAR *pwd = NULL;
CK_ULONG pwdLen = 0;
char *moduleSpec = NULL;
+ char *moduleSpecRerun = NULL;
char *configDir = NULL;
char *dbPrefix = NULL;
char *disableUnload = NULL;
@@ -462,8 +464,13 @@ main(int argc, char **argv)
moduleSpec = PR_smprintf("configdir='%s' certPrefix='%s' "
"keyPrefix='%s' secmod='secmod.db' flags= ",
configDir, dbPrefix, dbPrefix);
+ moduleSpecRerun = PR_smprintf("configdir='%s' certPrefix='%s' "
+ "keyPrefix='%s' secmod='secmod.db' flags=forcePOST ",
+ configDir, dbPrefix, dbPrefix);
initArgs.LibraryParameters = (CK_CHAR_PTR *)moduleSpec;
initArgs.pReserved = NULL;
+ initArgsRerun = initArgs;
+ initArgsRerun.LibraryParameters = (CK_CHAR_PTR *)moduleSpecRerun;
/*DebugBreak();*/
/* FIPSMODE invokes FC_Initialize as pFunctionList->C_Initialize */
@@ -709,7 +716,7 @@ main(int argc, char **argv)
if (doForkTests) {
/* testing one more C_Initialize / C_Finalize to exercise getpid()
* fork check code */
- crv = pFunctionList->C_Initialize(&initArgs);
+ crv = pFunctionList->C_Initialize(&initArgsRerun);
if (crv == CKR_OK) {
PKM_LogIt("C_Initialize succeeded\n");
} else {
@@ -745,6 +752,9 @@ cleanup:
if (moduleSpec) {
PR_smprintf_free(moduleSpec);
}
+ if (moduleSpecRerun) {
+ PR_smprintf_free(moduleSpecRerun);
+ }
#ifdef _WIN32
FreeLibrary(hModule);
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c
index e41bbe3a8..7ad899a77 100644
--- a/cmd/selfserv/selfserv.c
+++ b/cmd/selfserv/selfserv.c
@@ -1532,14 +1532,14 @@ handle_connection(PRFileDesc *tcp_sock, PRFileDesc *model_sock)
}
} else if (reqLen <= 0) { /* hit eof */
snprintf(msgBuf, sizeof(msgBuf), "Get or Post incomplete after %d bytes.\r\n",
- bufDat);
+ bufDat);
iovs[numIOVs].iov_base = msgBuf;
iovs[numIOVs].iov_len = PORT_Strlen(msgBuf);
numIOVs++;
} else if (reqLen < bufDat) {
snprintf(msgBuf, sizeof(msgBuf), "Discarded %d characters.\r\n",
- bufDat - reqLen);
+ bufDat - reqLen);
iovs[numIOVs].iov_base = msgBuf;
iovs[numIOVs].iov_len = PORT_Strlen(msgBuf);
diff --git a/cmd/signtool/certgen.c b/cmd/signtool/certgen.c
index 442b0d616..a2d03f7c3 100644
--- a/cmd/signtool/certgen.c
+++ b/cmd/signtool/certgen.c
@@ -130,7 +130,7 @@ GetSubjectFromUser(unsigned long serial)
cp = chop(buf);
if (*cp == '\0') {
snprintf(common_name_buf, sizeof(common_name_buf), "%s (%lu)", DEFAULT_COMMON_NAME,
- serial);
+ serial);
cp = common_name_buf;
}
common_name = PORT_ZAlloc(strlen(cp) + 6);
@@ -261,7 +261,7 @@ GetSubjectFromUser(unsigned long serial)
if (!email) {
out_of_memory();
}
- snprintf(email,strlen(cp) + 5, "E=%s,", cp);
+ snprintf(email, strlen(cp) + 5, "E=%s,", cp);
subjectlen += strlen(email);
}
@@ -273,13 +273,13 @@ GetSubjectFromUser(unsigned long serial)
}
snprintf(subject, subjectlen, "%s%s%s%s%s%s%s",
- common_name ? common_name : "",
- org ? org : "",
- orgunit ? orgunit : "",
- state ? state : "",
- country ? country : "",
- uid ? uid : "",
- email ? email : "");
+ common_name ? common_name : "",
+ org ? org : "",
+ orgunit ? orgunit : "",
+ state ? state : "",
+ country ? country : "",
+ uid ? uid : "",
+ email ? email : "");
if ((strlen(subject) > 1) && (subject[strlen(subject) - 1] == ' ')) {
subject[strlen(subject) - 2] = '\0';
}
@@ -662,7 +662,7 @@ output_ca_cert(CERTCertificate *cert, CERTCertDBHandle *db)
if (!filename)
out_of_memory();
- snprintf(filename, strlen(DEFAULT_X509_BASENAME) + 8,"%s.raw", DEFAULT_X509_BASENAME);
+ snprintf(filename, strlen(DEFAULT_X509_BASENAME) + 8, "%s.raw", DEFAULT_X509_BASENAME);
if ((out = fopen(filename, "wb")) == NULL) {
PR_fprintf(errorFD, "%s: Can't open %s output file\n", PROGRAM_NAME,
filename);
@@ -691,7 +691,7 @@ output_ca_cert(CERTCertificate *cert, CERTCertDBHandle *db)
/* and the cooked */
- snprintf(filename,strlen(DEFAULT_X509_BASENAME) + 8, "%s.cacert", DEFAULT_X509_BASENAME);
+ snprintf(filename, strlen(DEFAULT_X509_BASENAME) + 8, "%s.cacert", DEFAULT_X509_BASENAME);
if ((out = fopen(filename, "wb")) == NULL) {
PR_fprintf(errorFD, "%s: Can't open %s output file\n", PROGRAM_NAME,
filename);
View Lorry Controller Status