wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 01:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix SSL status ambiguity.

Browse source 
- Adds CipherSuite string with the full suite
- Changes CipherName to be the actual cipher name instead of the (erroneous) full suite like Firefox does.
This commit is contained in:
wolfbeast 2018-06-20 19:11:09 +02:00 • committed by Roy Tam
commit 624aa2c581
7 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
security/manager/ssl/TransportSecurityInfo.cpp
View file

@ -304,8 +304,8 @@ TransportSecurityInfo::GetInterface(const nsIID & uuid, void * *result)
// of the previous value. This is so when older versions attempt to
// read a newer serialized TransportSecurityInfo, they will actually
// fail and return NS_ERROR_FAILURE instead of silently failing.
#define TRANSPORTSECURITYINFOMAGIC { 0xa9863a23, 0x1faa, 0x4169, \
{ 0xb0, 0xd2, 0x81, 0x29, 0xec, 0x7c, 0xb1, 0xde } }
#define TRANSPORTSECURITYINFOMAGIC { 0xa9863a23, 0xa940, 0x4002, \
{ 0x94, 0x3c, 0x43, 0xc4, 0x67, 0x38, 0x8f, 0x3d } }
static NS_DEFINE_CID(kTransportSecurityInfoMagic, TRANSPORTSECURITYINFOMAGIC);
NS_IMETHODIMP

3
security/manager/ssl/nsISSLStatus.idl
View file

@ -8,11 +8,12 @@
interface nsIX509Cert;
[scriptable, uuid(fa9ba95b-ca3b-498a-b889-7c79cf28fee8)]
[scriptable, uuid(5415626b-2930-440e-bfc5-55c87dbc4511)]
interface nsISSLStatus : nsISupports {
readonly attribute nsIX509Cert serverCert;
readonly attribute ACString cipherName;
readonly attribute ACString cipherSuite;
readonly attribute unsigned long keyLength;
readonly attribute unsigned long secretKeyLength;
[must_use]

19
security/manager/ssl/nsSSLStatus.cpp
View file

@ -72,7 +72,24 @@ nsSSLStatus::GetCipherName(nsACString& aCipherName)
return NS_ERROR_FAILURE;
}
aCipherName.Assign(cipherInfo.cipherSuiteName);
aCipherName.Assign(cipherInfo.symCipherName);
return NS_OK;
}
NS_IMETHODIMP
nsSSLStatus::GetCipherSuite(nsACString& aCipherSuite)
{
if (!mHaveCipherSuiteAndProtocol) {
return NS_ERROR_NOT_AVAILABLE;
}
SSLCipherSuiteInfo cipherInfo;
if (SSL_GetCipherSuiteInfo(mCipherSuite, &cipherInfo,
sizeof(cipherInfo)) != SECSuccess) {
return NS_ERROR_FAILURE;
}
aCipherSuite.Assign(cipherInfo.cipherSuiteName);
return NS_OK;
}

5
security/manager/ssl/nsSSLStatus.h
View file

@ -69,8 +69,9 @@ private:
nsCOMPtr<nsIX509Cert> mServerCert;
};
// 600cd77a-e45c-4184-bfc5-55c87dbc4511
#define NS_SSLSTATUS_CID \
{ 0xe2f14826, 0x9e70, 0x4647, \
{ 0xb2, 0x3f, 0x10, 0x10, 0xf5, 0x12, 0x46, 0x28 } }
{ 0x600cd77a, 0xe45c, 0x4184, \
{ 0xbf, 0xc5, 0x55, 0xc8, 0x7d, 0xbc, 0x45, 0x11 } }
#endif