Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option to reset the cert and key database.

Browse Source
This commit is contained in:
relyea%netscape.com 2001-09-06 21:18:13 +00:00
parent 21e5114a55
commit 951dd94bbe
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
security/nss/cmd/certutil/certutil.c
View File

@ -977,6 +977,7 @@ Usage(char *progName)
#define FPS fprintf(stderr, #define FPS fprintf(stderr,
FPS "Type %s -H for more detailed descriptions\n", progName); FPS "Type %s -H for more detailed descriptions\n", progName);
FPS "Usage: %s -N [-d certdir] [-P dbprefix] [-f pwfile]\n", progName); FPS "Usage: %s -N [-d certdir] [-P dbprefix] [-f pwfile]\n", progName);
FPS "Usage: %s -T [-d certdir] [-P dbprefix] [-h token-name] [-f pwfile]\n", progName);
FPS "\t%s -A -n cert-name -t trustargs [-d certdir] [-P dbprefix] [-a] [-i input]\n", FPS "\t%s -A -n cert-name -t trustargs [-d certdir] [-P dbprefix] [-a] [-i input]\n",
progName); progName);
FPS "\t%s -C [-c issuer-name | -x] -i cert-request-file -o cert-file\n" FPS "\t%s -C [-c issuer-name | -x] -i cert-request-file -o cert-file\n"
@ -1167,6 +1168,15 @@ static void LongUsage(char *progName)
FPS "%-20s Cert & Key database prefix\n", FPS "%-20s Cert & Key database prefix\n",
" -P dbprefix"); " -P dbprefix");
FPS "\n"); FPS "\n");
FPS "%-15s Reset the Key database or token\n",
"-T");
FPS "%-20s Cert database directory (default is ~/.netscape)\n",
" -d certdir");
FPS "%-20s Cert & Key database prefix\n",
" -P dbprefix");
FPS "%-20s Token to reset (default is internal)\n"
" -h token-name");
FPS "\n");
FPS "%-15s Generate a certificate request (stdout)\n", FPS "%-15s Generate a certificate request (stdout)\n",
"-R"); "-R");
@ -2044,6 +2054,7 @@ enum {
cmd_NewDBs, cmd_NewDBs,
cmd_CertReq, cmd_CertReq,
cmd_CreateAndAddCert, cmd_CreateAndAddCert,
cmd_TokenReset,
cmd_ListModules, cmd_ListModules,
cmd_CheckCertValidity, cmd_CheckCertValidity,
cmd_ChangePassword, cmd_ChangePassword,
@ -2052,7 +2063,8 @@ enum {
/* Certutil options */ /* Certutil options */
enum { enum {
opt_AddKeyUsageExt = 0, opt_SSOPass = 0,
opt_AddKeyUsageExt,
opt_AddBasicConstraintExt, opt_AddBasicConstraintExt,
opt_AddAuthorityKeyIDExt, opt_AddAuthorityKeyIDExt,
opt_AddCRLDistPtsExt, opt_AddCRLDistPtsExt,
@ -2102,6 +2114,7 @@ static secuCommandFlag certutil_commands[] =
{ /* cmd_NewDBs */ 'N', PR_FALSE, 0, PR_FALSE }, { /* cmd_NewDBs */ 'N', PR_FALSE, 0, PR_FALSE },
{ /* cmd_CertReq */ 'R', PR_FALSE, 0, PR_FALSE }, { /* cmd_CertReq */ 'R', PR_FALSE, 0, PR_FALSE },
{ /* cmd_CreateAndAddCert */ 'S', PR_FALSE, 0, PR_FALSE }, { /* cmd_CreateAndAddCert */ 'S', PR_FALSE, 0, PR_FALSE },
{ /* cmd_TokenReset */ 'T', PR_FALSE, 0, PR_FALSE },
{ /* cmd_ListModules */ 'U', PR_FALSE, 0, PR_FALSE }, { /* cmd_ListModules */ 'U', PR_FALSE, 0, PR_FALSE },
{ /* cmd_CheckCertValidity */ 'V', PR_FALSE, 0, PR_FALSE }, { /* cmd_CheckCertValidity */ 'V', PR_FALSE, 0, PR_FALSE },
{ /* cmd_ChangePassword */ 'W', PR_FALSE, 0, PR_FALSE }, { /* cmd_ChangePassword */ 'W', PR_FALSE, 0, PR_FALSE },
@ -2110,6 +2123,7 @@ static secuCommandFlag certutil_commands[] =
static secuCommandFlag certutil_options[] = static secuCommandFlag certutil_options[] =
{ {
{ /* opt_SSOPass */ '0', PR_TRUE, 0, PR_FALSE },
{ /* opt_AddKeyUsageExt */ '1', PR_FALSE, 0, PR_FALSE }, { /* opt_AddKeyUsageExt */ '1', PR_FALSE, 0, PR_FALSE },
{ /* opt_AddBasicConstraintExt*/ '2', PR_FALSE, 0, PR_FALSE }, { /* opt_AddBasicConstraintExt*/ '2', PR_FALSE, 0, PR_FALSE },
{ /* opt_AddAuthorityKeyIDExt*/ '3', PR_FALSE, 0, PR_FALSE }, { /* opt_AddAuthorityKeyIDExt*/ '3', PR_FALSE, 0, PR_FALSE },
@ -2540,6 +2554,17 @@ main(int argc, char **argv)
rv = SECU_ChangePW(slot, 0, certutil.options[opt_PasswordFile].arg); rv = SECU_ChangePW(slot, 0, certutil.options[opt_PasswordFile].arg);
return rv ? 255 : 0; return rv ? 255 : 0;
} }
/* Reset the a token */
if (certutil.commands[cmd_TokenReset].activated) {
char *sso_pass = "";
if (certutil.options[opt_SSOPass].activated) {
sso_pass = certutil.options[opt_SSOPass].arg;
}
rv = PK11_ResetToken(slot,sso_pass);
return !rv - 1;
}
/* Check cert validity against current time (-V) */ /* Check cert validity against current time (-V) */
if (certutil.commands[cmd_CheckCertValidity].activated) { if (certutil.commands[cmd_CheckCertValidity].activated) {
/* XXX temporary hack for fips - must log in to get priv key */ /* XXX temporary hack for fips - must log in to get priv key */