Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1312158 - Stop using Scoped.h NSS types under netwerk/. r=nwgh

Browse Source 
Scoped.h is deprecated.

MozReview-Commit-ID: AKfsw0lqTfw

--HG--
extra : rebase_source : a2c28b8e1a77ba491e6c842e98b2c7457b793f12
This commit is contained in:
Cykesiopka 2016-10-23 13:27:33 +08:00
parent 587483aae4
commit 660da8b92b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netwerk/base/TLSServerSocket.cpp
View File

@ -113,19 +113,20 @@ TLSServerSocket::OnSocketListen()
return NS_ERROR_NOT_INITIALIZED;
}
ScopedCERTCertificate cert(mServerCert->GetCert());
UniqueCERTCertificate cert(mServerCert->GetCert());
if (NS_WARN_IF(!cert)) {
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
}
ScopedSECKEYPrivateKey key(PK11_FindKeyByAnyCert(cert, nullptr));
UniqueSECKEYPrivateKey key(PK11_FindKeyByAnyCert(cert.get(), nullptr));
if (NS_WARN_IF(!key)) {
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
}
SSLKEAType certKEA = NSS_FindCertKEAType(cert);
SSLKEAType certKEA = NSS_FindCertKEAType(cert.get());
nsresult rv = MapSECStatus(SSL_ConfigSecureServer(mFD, cert, key, certKEA));
nsresult rv = MapSECStatus(SSL_ConfigSecureServer(mFD, cert.get(), key.get(),
certKEA));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -457,7 +458,7 @@ TLSServerConnectionInfo::HandshakeCallback(PRFileDesc* aFD)
{
nsresult rv;
ScopedCERTCertificate clientCert(SSL_PeerCertificate(aFD));
UniqueCERTCertificate clientCert(SSL_PeerCertificate(aFD));
if (clientCert) {
nsCOMPtr<nsIX509CertDB> certDB =
do_GetService(NS_X509CERTDB_CONTRACTID, &rv);

2
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -1807,7 +1807,7 @@ nsHttpChannel::ProcessSSLInformation()
nsCOMPtr<nsIX509Cert> cert;
sslstat->GetServerCert(getter_AddRefs(cert));
if (cert) {
ScopedCERTCertificate nssCert(cert->GetCert());
UniqueCERTCertificate nssCert(cert->GetCert());
if (nssCert) {
SECOidTag tag = SECOID_GetAlgorithmTag(&nssCert->signature);
LOG(("Checking certificate signature: The OID tag is %i [this=%p]\n", tag, this));