Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug #83160, change master password broken

Browse Source 
r=javi, sr=blizzard, a=asa
This commit is contained in:
mcgreer%netscape.com 2001-06-12 18:52:20 +00:00
parent cf53c8d954
commit 49303a06c2
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/manager/pki/resources/content/device_manager.js
View File

@ -345,19 +345,11 @@ function changePassword()
{
getSelectedItem();
token = selected_slot.getToken();
try {
// this seems to be neccessary, otherwise it fails in the PKCS#11 layer.
// but it doesn't feel right...
if (!token.isLoggedIn()) {
token.login(true);
}
window.open("changepassword.xul",
selected_slot.tokenName,
"chrome,width=300,height=350,resizable=0,modal=1,dialog=1");
showSlotInfo();
enableButtons();
} catch (e) {
}
window.open("changepassword.xul",
selected_slot.tokenName,
"chrome,resizable=1,modal=1,dialog=1");
showSlotInfo();
enableButtons();
}
// browse fs for PKCS#11 device

10
security/manager/pki/resources/content/password.js
View File

@ -87,11 +87,17 @@ function setPassword()
var oldpwbox = document.getElementById("oldpw");
var initpw = oldpwbox.getAttribute("inited");
var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
if (initpw == "false") {
try {
token.changePassword(oldpwbox.value, pw1.value);
var passok = token.checkPassword(oldpwbox.value);
if (passok) {
token.changePassword(oldpwbox.value, pw1.value);
alert(bundle.GetStringFromName("pw_change_ok"));
} else {
alert(bundle.GetStringFromName("incorrect_pw"));
}
} catch (e) {
var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
alert(bundle.GetStringFromName("failed_pw_change"));
}
} else {

2
security/manager/pki/resources/locale/en-US/pippki.properties
View File

@ -86,6 +86,8 @@ escrowFinalMessage=You should click OK only if you trust "%S" to protect your en
#Token Manager
password_not_set=(not set)
failed_pw_change=Failed to change password.
incorrect_pw=Incorrect password entered.
pw_change_ok=Personal security password successfully changed.
loadPK11TokenDialog=Choose a PKCS#11 device to load
devinfo_modname=Module
devinfo_modpath=Path

18
security/manager/ssl/src/nsPK11TokenDB.cpp
View File

@ -22,6 +22,8 @@
*/
#include "nsISupports.h"
#include "nsIPK11TokenDB.h"
#include "prerror.h"
#include "secerr.h"
#include "nsPK11TokenDB.h"
@ -180,7 +182,21 @@ NS_IMETHODIMP nsPK11Token::GetNeedsUserInit(PRBool *aNeedsUserInit)
/* boolean checkPassword (in wstring password); */
NS_IMETHODIMP nsPK11Token::CheckPassword(const PRUnichar *password, PRBool *_retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
SECStatus srv;
PRInt32 prerr;
srv = PK11_CheckUserPassword(mSlot,
NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(password).get()));
if (srv != SECSuccess) {
*_retval = PR_FALSE;
prerr = PR_GetError();
if (prerr != SEC_ERROR_BAD_PASSWORD) {
/* something really bad happened - throw an exception */
return NS_ERROR_FAILURE;
}
} else {
*_retval = PR_TRUE;
}
return NS_OK;
}
/* void initPassword (in wstring initialPassword); */