Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=195574 SSL extremely flaky if Ask for Master Password is 'Every time'

Browse Source 
r=darin sr=brendan


git-svn-id: svn://10.0.0.236/trunk@144562 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%netscape.com
2003-07-08 14:41:02 +00:00
parent 65792a6f28
commit 3ece8d7a91
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/extensions/wallet/src/nsWalletService.cpp
View File

@@ -309,7 +309,7 @@ ExpireMasterPasswordPrefChanged(const char * newpref, void * data) {
}
if (expireMasterPassword) {
PRBool status;
WLLT_ExpirePassword(&status);
WLLT_ExpirePasswordOnly(&status);
}
return 0;
}
@@ -495,7 +495,7 @@ nsWalletlibService::OnStateChange(nsIWebProgress* aWebProgress,
}
if (expireMasterPassword) {
PRBool status;
WLLT_ExpirePassword(&status);
WLLT_ExpirePasswordOnly(&status);
}
}
}

9
mozilla/extensions/wallet/src/wallet.cpp
View File

@@ -769,6 +769,15 @@ PRIVATE nsresult DecryptString (const char * crypt, char *& text) {
PUBLIC void
WLLT_ExpirePassword(PRBool* status) {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
rv = gSecretDecoderRing->LogoutAndTeardown();
}
*status = NS_SUCCEEDED(rv);
}
PUBLIC void
WLLT_ExpirePasswordOnly(PRBool* status) {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
rv = gSecretDecoderRing->Logout();

3
mozilla/extensions/wallet/src/wallet.h
View File

@@ -114,6 +114,9 @@ WLLT_FetchFromNetCenter();
extern void
WLLT_ExpirePassword(PRBool* status);
extern void
WLLT_ExpirePasswordOnly(PRBool* status);
extern void
WLLT_InitReencryptCallback(nsIDOMWindowInternal* window);

4
mozilla/netwerk/base/public/nsISecretDecoderRing.idl
View File

@@ -63,6 +63,10 @@ interface nsISecretDecoderRing: nsISupports {
/* Logout of the security device that protects the SDR key */
void logout();
/* Logout of the security device that protects the SDR key
and tear down authenticated objects. */
void logoutAndTeardown();
};
/*

18
mozilla/security/manager/ssl/src/nsSDR.cpp
View File

@@ -308,7 +308,7 @@ ChangePassword()
}
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
/* void logout(); */
NS_IMETHODIMP nsSecretDecoderRing::
Logout()
{
@@ -322,6 +322,22 @@ Logout()
PK11_LogoutAll();
}
return NS_OK;
}
NS_IMETHODIMP nsSecretDecoderRing::
LogoutAndTeardown()
{
nsresult rv;
nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID, &rv));
if (NS_FAILED(rv))
return rv;
{
nsNSSShutDownPreventionLock locker;
PK11_LogoutAll();
}
return nssComponent->LogoutAuthenticatedPK11();
}