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

fixes bug 308405 "'@mozilla.org/security/hash;1' incorrectly invoked as a service in nsHttpDigestAuth.cpp" r=dougt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@180261 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net 2005-09-15 00:25:21 +00:00
parent 09d5c820ae
commit 69b5c49ffb
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
View File

@ -62,18 +62,7 @@
//-----------------------------------------------------------------------------
nsHttpDigestAuth::nsHttpDigestAuth()
{
mVerifier = do_GetService("@mozilla.org/security/hash;1");
mGotVerifier = (mVerifier != nsnull);
#if defined(PR_LOGGING)
if (mGotVerifier) {
LOG(("nsHttpDigestAuth: Got signature_verifier\n"));
} else {
LOG(("nsHttpDigestAuth: No signature_verifier available\n"));
}
#endif
}
{}
nsHttpDigestAuth::~nsHttpDigestAuth()
{}
@ -91,11 +80,17 @@ NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator)
nsresult
nsHttpDigestAuth::MD5Hash(const char *buf, PRUint32 len)
{
if (!mGotVerifier)
return NS_ERROR_NOT_INITIALIZED;
nsresult rv;
// Cache a reference to the nsICryptoHash instance since we'll be calling
// this function frequently.
if (!mVerifier) {
mVerifier = do_CreateInstance("@mozilla.org/security/hash;1", &rv);
if (NS_FAILED(rv)) {
LOG(("nsHttpDigestAuth: no crypto hash!\n"));
return rv;
}
}
rv = mVerifier->Init(nsICryptoHash::MD5);
if (NS_FAILED(rv)) return rv;
@ -106,9 +101,10 @@ nsHttpDigestAuth::MD5Hash(const char *buf, PRUint32 len)
nsCAutoString hashString;
rv = mVerifier->Finish(PR_FALSE, hashString);
if (NS_FAILED(rv)) return rv;
if (NS_SUCCEEDED(rv))
memcpy(mHashBuf, hashString.get(), hashString.Length());
NS_ENSURE_STATE(hashString.Length() == sizeof(mHashBuf));
memcpy(mHashBuf, hashString.get(), hashString.Length());
return rv;
}

1
mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.h
View File

@ -112,7 +112,6 @@ class nsHttpDigestAuth : public nsIHttpAuthenticator
protected:
nsCOMPtr<nsICryptoHash> mVerifier;
char mHashBuf[DIGEST_LENGTH];
PRBool mGotVerifier;
};
#endif // nsHttpDigestAuth_h__