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

Fix for Bug 84057 r=ddrinan, sr=blizzard, a=asa

Browse Source 
Fix for crasher if doing SSL with a site whose certificate
  was issued by a cert with a non-ASCII character in its
  subject name.  We now get the peer's certificate from the
  SSL libraries instead of trying to re-parse the UTF8 string
  (which NSS doesn't like) into the CERTName structure that's
  already in the certificate.


git-svn-id: svn://10.0.0.236/trunk@96862 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
javi%netscape.com 2001-06-11 17:32:31 +00:00
parent 9a61bd2883
commit 88ef0e46b1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
View File

@ -206,12 +206,21 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
secStatus = (nsIWebProgressListener::STATE_IS_SECURE |
nsIWebProgressListener::STATE_SECURE_LOW);
CERTName* certName = CERT_AsciiToName(signer);
char* caName = CERT_GetOrgName(certName);
CERTCertificate *peerCert = SSL_PeerCertificate(fd);
char* caName = CERT_GetOrgName(&peerCert->subject);
CERT_DestroyCertificate(peerCert);
if (!caName) {
caName = signer;
}
// If the CA name is RSA Data Security, then change the name to the real
// name of the company i.e. VeriSign, Inc.
if (nsCRT::strcmp((const char*)caName, "RSA Data Security, Inc.") == 0) {
// In this case, caName != signer since the logic implies signer
// would be at minimal "O=RSA Data Security, Inc" because caName
// is what comes after to O=. So we're OK just freeing this memory
// without checking to see if it's equal to signer;
NS_ASSERTION(caName != signer, "caName was equal to caName when it shouldn't be");
PR_Free(caName);
caName = PL_strdup("Verisign, Inc.");
}
@ -244,8 +253,8 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
infoObject->SetSSLStatus(status);
PR_Free(caName);
CERT_DestroyName(certName);
if (caName != signer)
PR_Free(caName);
PR_Free(signer);
PR_Free(cipherName);
}