b=139329 Crashes trying to send signed mail.

r=javi sr=alecf
This commit is contained in:
kaie%netscape.com 2002-05-07 09:25:19 +00:00
parent d27f526b27
commit a1ca0c87e8

View File

@ -4546,16 +4546,23 @@ nsNSSCertificateDB::EnableOCSP()
NS_IMETHODIMP
nsNSSCertificateDB::GetEmailEncryptionCert(const PRUnichar* aNickname, nsIX509Cert **_retval)
{
if (!aNickname || !_retval)
return NS_ERROR_FAILURE;
*_retval = 0;
nsDependentString aDepNickname(aNickname);
if (aDepNickname.IsEmpty())
return NS_OK;
nsresult rv = NS_OK;
CERTCertificate *cert = 0;
nsCOMPtr<nsIInterfaceRequestor> ctx = new PipUIContext();
nsNSSCertificate *nssCert = nsnull;
char *asciiname = NULL;
NS_ConvertUCS2toUTF8 aUtf8Nickname(aNickname);
NS_ConvertUCS2toUTF8 aUtf8Nickname(aDepNickname);
asciiname = NS_CONST_CAST(char*, aUtf8Nickname.get());
*_retval = 0;
/* Find a good cert in the user's database */
cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), asciiname,
certUsageEmailRecipient, PR_TRUE, ctx);
@ -4579,16 +4586,23 @@ loser:
NS_IMETHODIMP
nsNSSCertificateDB::GetEmailSigningCert(const PRUnichar* aNickname, nsIX509Cert **_retval)
{
if (!aNickname || !_retval)
return NS_ERROR_FAILURE;
*_retval = 0;
nsDependentString aDepNickname(aNickname);
if (aDepNickname.IsEmpty())
return NS_OK;
nsresult rv = NS_OK;
CERTCertificate *cert = 0;
nsCOMPtr<nsIInterfaceRequestor> ctx = new PipUIContext();
nsNSSCertificate *nssCert = nsnull;
char *asciiname = NULL;
NS_ConvertUCS2toUTF8 aUtf8Nickname(aNickname);
NS_ConvertUCS2toUTF8 aUtf8Nickname(aDepNickname);
asciiname = NS_CONST_CAST(char*, aUtf8Nickname.get());
*_retval = 0;
/* Find a good cert in the user's database */
cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), asciiname,
certUsageEmailSigner, PR_TRUE, ctx);