зеркало из https://github.com/mozilla/gecko-dev.git
Bug 136209: added the -P dbprefix option. The original -P (partial CRL
decode) option was renamed -p.
This commit is contained in:
Родитель
ae6ab3c029
Коммит
d982fc5cee
|
@ -228,9 +228,9 @@ SECStatus ImportCRL (CERTCertDBHandle *certHandle, char *url, int type,
|
||||||
static void Usage(char *progName)
|
static void Usage(char *progName)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Usage: %s -L [-n nickname[ [-d keydir] [-t crlType]\n"
|
"Usage: %s -L [-n nickname] [-d keydir] [-P dbprefix] [-t crlType]\n"
|
||||||
" %s -D -n nickname [-d keydir]\n"
|
" %s -D -n nickname [-d keydir] [-P dbprefix]\n"
|
||||||
" %s -I -i crl -t crlType [-u url] [-d keydir] [-B]\n",
|
" %s -I -i crl -t crlType [-u url] [-d keydir] [-P dbprefix] [-B]\n",
|
||||||
progName, progName, progName);
|
progName, progName, progName);
|
||||||
|
|
||||||
fprintf (stderr, "%-15s List CRL\n", "-L");
|
fprintf (stderr, "%-15s List CRL\n", "-L");
|
||||||
|
@ -238,6 +238,8 @@ static void Usage(char *progName)
|
||||||
"-n nickname");
|
"-n nickname");
|
||||||
fprintf(stderr, "%-20s Key database directory (default is ~/.netscape)\n",
|
fprintf(stderr, "%-20s Key database directory (default is ~/.netscape)\n",
|
||||||
"-d keydir");
|
"-d keydir");
|
||||||
|
fprintf(stderr, "%-20s Cert & Key database prefix (default is \"\")\n",
|
||||||
|
"-P dbprefix");
|
||||||
|
|
||||||
fprintf (stderr, "%-15s Delete a CRL from the cert dbase\n", "-D");
|
fprintf (stderr, "%-15s Delete a CRL from the cert dbase\n", "-D");
|
||||||
fprintf(stderr, "%-20s Specify the nickname for the CA certificate\n",
|
fprintf(stderr, "%-20s Specify the nickname for the CA certificate\n",
|
||||||
|
@ -254,7 +256,7 @@ static void Usage(char *progName)
|
||||||
fprintf(stderr, "%-20s \t 0 - SEC_KRL_TYPE\n", " ");
|
fprintf(stderr, "%-20s \t 0 - SEC_KRL_TYPE\n", " ");
|
||||||
fprintf(stderr, "%-20s \t 1 - SEC_CRL_TYPE\n", " ");
|
fprintf(stderr, "%-20s \t 1 - SEC_CRL_TYPE\n", " ");
|
||||||
fprintf(stderr, "\n%-20s Bypass CA certificate checks.\n", "-B");
|
fprintf(stderr, "\n%-20s Bypass CA certificate checks.\n", "-B");
|
||||||
fprintf(stderr, "\n%-20s Partial decode for faster operation.\n", "-P");
|
fprintf(stderr, "\n%-20s Partial decode for faster operation.\n", "-p");
|
||||||
|
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
@ -271,6 +273,7 @@ int main(int argc, char **argv)
|
||||||
int rv;
|
int rv;
|
||||||
char *nickName;
|
char *nickName;
|
||||||
char *url;
|
char *url;
|
||||||
|
char *dbPrefix = "";
|
||||||
int crlType;
|
int crlType;
|
||||||
PLOptState *optstate;
|
PLOptState *optstate;
|
||||||
PLOptStatus status;
|
PLOptStatus status;
|
||||||
|
@ -293,17 +296,13 @@ int main(int argc, char **argv)
|
||||||
/*
|
/*
|
||||||
* Parse command line arguments
|
* Parse command line arguments
|
||||||
*/
|
*/
|
||||||
optstate = PL_CreateOptState(argc, argv, "PBIALd:i:Dn:Ct:u:");
|
optstate = PL_CreateOptState(argc, argv, "BCDILP:d:i:n:pt:u:");
|
||||||
while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
|
while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
|
||||||
switch (optstate->option) {
|
switch (optstate->option) {
|
||||||
case '?':
|
case '?':
|
||||||
Usage(progName);
|
Usage(progName);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'P':
|
|
||||||
decodeOptions |= CRL_DECODE_SKIP_ENTRIES;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'B':
|
case 'B':
|
||||||
importOptions |= CRL_IMPORT_BYPASS_CHECKS;
|
importOptions |= CRL_IMPORT_BYPASS_CHECKS;
|
||||||
break;
|
break;
|
||||||
|
@ -324,6 +323,10 @@ int main(int argc, char **argv)
|
||||||
listCRL = 1;
|
listCRL = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'P':
|
||||||
|
dbPrefix = strdup(optstate->value);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'd':
|
case 'd':
|
||||||
SECU_ConfigDirectory(optstate->value);
|
SECU_ConfigDirectory(optstate->value);
|
||||||
break;
|
break;
|
||||||
|
@ -341,8 +344,8 @@ int main(int argc, char **argv)
|
||||||
nickName = strdup(optstate->value);
|
nickName = strdup(optstate->value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'u':
|
case 'p':
|
||||||
url = strdup(optstate->value);
|
decodeOptions |= CRL_DECODE_SKIP_ENTRIES;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 't': {
|
case 't': {
|
||||||
|
@ -355,6 +358,10 @@ int main(int argc, char **argv)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'u':
|
||||||
|
url = strdup(optstate->value);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -364,7 +371,8 @@ int main(int argc, char **argv)
|
||||||
if (importCRL && !inFile) Usage (progName);
|
if (importCRL && !inFile) Usage (progName);
|
||||||
|
|
||||||
PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
|
PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
|
||||||
secstatus = NSS_InitReadWrite(SECU_ConfigDirectory(NULL));
|
secstatus = NSS_Initialize(SECU_ConfigDirectory(NULL), dbPrefix, dbPrefix,
|
||||||
|
"secmod.db", 0);
|
||||||
if (secstatus != SECSuccess) {
|
if (secstatus != SECSuccess) {
|
||||||
SECU_PrintPRandOSError(progName);
|
SECU_PrintPRandOSError(progName);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче