Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-08 07:53:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=107817 Make sure sent encrypted messages will be decryptable by sender.

Browse Source 
r=ddrinan
sr=alecf
a=roc+moz
This commit is contained in:
kaie%netscape.com 2002-03-27 03:27:43 +00:00
parent 30484c4cec
commit f2af1c2edb
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
View File

@ -855,6 +855,9 @@ nsresult nsMsgComposeSecure::MimeCryptoHackCerts(const char *aRecipients,
/* If the message is to be encrypted, then get the recipient certs */
if (aEncrypt) {
mailbox = mailbox_list;
PRBool already_added_self_cert = PR_FALSE;
for (; count > 0; count--) {
nsCOMPtr<nsIX509Cert> cert;
certdb->GetCertByEmailAddress(nsnull, mailbox, getter_AddRefs(cert));
@ -884,9 +887,20 @@ nsresult nsMsgComposeSecure::MimeCryptoHackCerts(const char *aRecipients,
of the recipients if we're sending a signed-but-not-encrypted
message.)
*/
PRBool isSame;
if (NS_SUCCEEDED(cert->IsSameCert(mSelfEncryptionCert, &isSame))
&& isSame) {
already_added_self_cert = PR_TRUE;
}
mCerts->AppendElement(cert);
mailbox += nsCRT::strlen(mailbox) + 1;
}
if (!already_added_self_cert) {
mCerts->AppendElement(mSelfEncryptionCert);
}
}
FAIL:
PR_FREEIF(mailbox_list);

1
security/manager/ssl/public/nsIX509Cert.idl
View File

@ -203,6 +203,7 @@ interface nsIX509Cert : nsISupports {
[noscript] unsigned long getRawDER(out charPtr result);
PRBool isSameCert(in nsIX509Cert other);
};
%{C++

14
security/manager/ssl/src/nsNSSCertificate.cpp
View File

@ -2667,6 +2667,20 @@ nsNSSCertificate::GetASN1Structure(nsIASN1Object * *aASN1Structure)
return rv;
}
NS_IMETHODIMP
nsNSSCertificate::IsSameCert(nsIX509Cert *other, PRBool *result)
{
NS_ENSURE_ARG(other);
NS_ENSURE_ARG(result);
nsNSSCertificate *other2 = NS_STATIC_CAST(nsNSSCertificate*, other);
if (!other2)
return NS_ERROR_FAILURE;
*result = (mCert == other2->mCert);
return NS_OK;
}
/* nsNSSCertificateDB */