Bug 1786662 - Fix usages of securityInfo in protocols. r=rnons
Differential Revision: https://phabricator.services.mozilla.com/D155577 --HG-- extra : rebase_source : f1dc9f271c9a23ec11fddd0191bb11aebc6672d9 extra : amend_source : fb9c55edfd4b3be410940d01a8ea907ac253c892
This commit is contained in:
Родитель
efa661f450
Коммит
293cbd8b23
|
@ -262,7 +262,7 @@ var Socket = {
|
|||
disconnected: true,
|
||||
|
||||
startTLS() {
|
||||
this.transport.securityInfo
|
||||
this.transport.tlsSocketControl
|
||||
.QueryInterface(Ci.nsISSLSocketControl)
|
||||
.StartTLS();
|
||||
},
|
||||
|
@ -465,7 +465,7 @@ var Socket = {
|
|||
let nssErrorsService = Cc["@mozilla.org/nss_errors_service;1"].getService(
|
||||
Ci.nsINSSErrorsService
|
||||
);
|
||||
this.securityInfo = this.transport.securityInfo.QueryInterface(
|
||||
this.securityInfo = this.transport.tlsSocketControl.QueryInterface(
|
||||
Ci.nsITransportSecurityInfo
|
||||
);
|
||||
this.onConnectionSecurityError(
|
||||
|
|
|
@ -250,7 +250,7 @@ class LDAPClient {
|
|||
_onError = event => {
|
||||
this._logger.error(event);
|
||||
this._socket.close();
|
||||
this.onError(event.errorCode, event.target.transport?.securityInfo);
|
||||
this.onError(event.errorCode, event.target.transport?.tlsSocketControl);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -439,7 +439,7 @@ class SmtpClient {
|
|||
let secInfo = null;
|
||||
if (TCPSocketErrorEvent.isInstance(e)) {
|
||||
nsError = e.errorCode;
|
||||
secInfo = e.target.transport?.securityInfo;
|
||||
secInfo = e.target.transport?.tlsSocketControl;
|
||||
}
|
||||
// Use nsresult to integrate with other parts of sending process, e.g.
|
||||
// MessageSend.jsm will show an error message depending on the nsresult.
|
||||
|
|
|
@ -524,7 +524,7 @@ class ImapClient {
|
|||
return;
|
||||
}
|
||||
this.logout();
|
||||
let secInfo = event.target.transport?.securityInfo;
|
||||
let secInfo = event.target.transport?.tlsSocketControl;
|
||||
if (secInfo) {
|
||||
this.runningUrl.failedSecInfo = secInfo;
|
||||
}
|
||||
|
|
|
@ -325,7 +325,7 @@ class Pop3Client {
|
|||
this._logger.error(`${event.name}: a ${event.message} error occurred`);
|
||||
this._server.serverBusy = false;
|
||||
this.quit();
|
||||
let secInfo = event.target.transport?.securityInfo;
|
||||
let secInfo = event.target.transport?.tlsSocketControl;
|
||||
if (secInfo) {
|
||||
this.runningUri.failedSecInfo = secInfo;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче