commit b81fe53f5fe1ecd749ca900ccfc1a00ae1fd9328 Author: Shane Caraveo scaraveo@mozilla.com Date: Fri Jul 6 09:41:56 2018 -0300

Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl

MozReview-Commit-ID: 2Ca7xCMOPAH

--HG-- extra : rebase_source : 2fa9d6b80c9ead0d90927878ce10390791cbadd9 --- toolkit/components/extensions/schemas/web_request.json | 10 ++++++++++ toolkit/modules/addons/SecurityInfo.jsm | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index 508ca8b05f8f..6fe12f7b6ca5 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -269,6 +269,16 @@ "description": "The cipher suite used in this request if state is "secure".", "optional": true }, + "keaGroupName": { + "type": "string", + "description": "The key exchange algorithm used in this request if state is "secure".", + "optional": true + }, + "signatureSchemeName": { + "type": "string", + "description": "The signature scheme used in this request if state is "secure".", + "optional": true + }, "certificates": { "description": "Certificate data if state is "secure". Will only contain one entry unless <code>certificateChain</code> is passed as an option.", "type": "array", diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index 8c5cef18754d..a931602b517a 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -137,10 +137,14 @@ const SecurityInfo = { info.cipherSuite = SSLStatus.cipherName;

// Key exchange group name. - info.keaGroupName = SSLStatus.keaGroupName; + if (SSLStatus.keaGroupName !== "none") { + info.keaGroupName = SSLStatus.keaGroupName; + }

// Certificate signature scheme. - info.signatureSchemeName = SSLStatus.signatureSchemeName; + if (SSLStatus.signatureSchemeName !== "none") { + info.signatureSchemeName = SSLStatus.signatureSchemeName; + }

info.isDomainMismatch = SSLStatus.isDomainMismatch; info.isExtendedValidation = SSLStatus.isExtendedValidation;