Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 480226 - Fix warnings in security/manager/ssl/src; r=kaie

Browse Source
This commit is contained in:
Blake Kaplan 2009-03-15 14:58:38 +01:00
parent 7bf4b86d94
commit af74d3a22c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/manager/ssl/src/nsCrypto.cpp
View File

@ -2263,7 +2263,6 @@ nsCrypto::ImportUserCertificates(const nsAString& aNickname,
{
nsNSSShutDownPreventionLock locker;
char *nickname=nsnull, *cmmfResponse=nsnull;
char *retString=nsnull;
CMMFCertRepContent *certRepContent = nsnull;
int numResponses = 0;
nsIX509Cert **certArr = nsnull;
@ -2382,8 +2381,6 @@ nsCrypto::ImportUserCertificates(const nsAString& aNickname,
//nickname (This way we don't free it twice and avoid crashing.
//That would be a good thing.
retString = "";
//Import the root chain into the cert db.
caPubs = CMMF_CertRepContentGetCAPubs(certRepContent);
if (caPubs) {
@ -2440,7 +2437,7 @@ nsCrypto::ImportUserCertificates(const nsAString& aNickname,
}
delete []certArr;
}
aReturn.Assign(NS_ConvertASCIItoUTF16(retString));
aReturn.Assign(EmptyString());
if (nickname) {
NS_Free(nickname);
}

4
security/manager/ssl/src/nsKeygenHandler.cpp
View File

@ -170,7 +170,7 @@ done:
}
typedef struct curveNameTagPairStr {
char *curveName;
const char *curveName;
SECOidTag curveOidTag;
} CurveNameTagPair;
@ -258,7 +258,7 @@ static CurveNameTagPair nameTagPair[] =
};
SECKEYECParams *
decode_ec_params(char *curve)
decode_ec_params(const char *curve)
{
SECKEYECParams *ecparams;
SECOidData *oidData = NULL;

2
security/manager/ssl/src/nsKeygenHandler.h
View File

@ -51,7 +51,7 @@ nsresult GetSlotWithMechanism(PRUint32 mechanism,
#define DEFAULT_RSA_KEYGEN_PE 65537L
#define DEFAULT_RSA_KEYGEN_ALG SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION
SECKEYECParams *decode_ec_params(char *curve);
SECKEYECParams *decode_ec_params(const char *curve);
class nsKeygenFormProcessor : public nsIFormProcessor {
public: