diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
| commit | aff03b0a67c41cf7af5df9c9eef715a8b27a2667 (patch) | |
| tree | aa2909ae4718f81c83c8cfb68c1f5a23485b3173 /security/nss/cmd/modutil/pk11.c | |
| parent | bdb4ff581677ad1cd411b55a68c87534f9a64882 (diff) | |
| parent | 11caf6ecb3cb8c84d2355a6c6e9580a290147e92 (diff) | |
| download | UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.gz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.lz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.xz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_1
Diffstat (limited to 'security/nss/cmd/modutil/pk11.c')
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index 1efc1895c..834469af1 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/security/nss/cmd/modutil/pk11.c @@ -670,39 +670,6 @@ loser: /************************************************************************ * - * I n i t P W - */ -Error -InitPW(void) -{ - PK11SlotInfo *slot; - Error ret = UNSPECIFIED_ERR; - - slot = PK11_GetInternalKeySlot(); - if (!slot) { - PR_fprintf(PR_STDERR, errStrings[NO_SUCH_TOKEN_ERR], "internal"); - return NO_SUCH_TOKEN_ERR; - } - - /* Set the initial password to empty */ - if (PK11_NeedUserInit(slot)) { - if (PK11_InitPin(slot, NULL, "") != SECSuccess) { - PR_fprintf(PR_STDERR, errStrings[INITPW_FAILED_ERR]); - ret = INITPW_FAILED_ERR; - goto loser; - } - } - - ret = SUCCESS; - -loser: - PK11_FreeSlot(slot); - - return ret; -} - -/************************************************************************ - * * C h a n g e P W */ Error @@ -728,7 +695,7 @@ ChangePW(char *tokenName, char *pwFile, char *newpwFile) ret = BAD_PW_ERR; goto loser; } - } else if (PK11_NeedLogin(slot)) { + } else { for (matching = PR_FALSE; !matching;) { oldpw = SECU_GetPasswordString(NULL, "Enter old password: "); if (PK11_CheckUserPassword(slot, oldpw) == SECSuccess) { |