kamp/RetroZilla
1
0
Fork 0
mirror of https://github.com/rn10950/RetroZilla.git synced 2024-11-13 03:10:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

PSM: Show protocol version in cipherName

Browse Source
This commit is contained in:
roytam1 2018-07-11 23:41:23 +08:00
parent a572ea8ca3
commit a4e283f567
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/manager/pki/resources/content/PageInfoOverlay.xul
View File

@ -100,11 +100,26 @@
issuerName = this.mapIssuerOrganization(cert.issuerOrganization);
if (!issuerName) issuerName = cert.issuerName;
var protocolVersion = " (unknown)";
switch(status.protocolVersion) {
case 0:
protocolVersion = " (SSL3)";
break;
case 1:
protocolVersion = " (TLS1.0)";
break;
case 2:
protocolVersion = " (TLS1.1)";
break;
case 3:
protocolVersion = " (TLS1.2)";
break;
}
return {
hostName : hName,
cAName : issuerName,
encryptionAlgorithm : status.cipherName,
encryptionAlgorithm : status.cipherName+protocolVersion,
encryptionStrength : status.secretKeyLength,
isBroken : isBroken,
cert : cert

1
security/manager/ssl/public/nsISSLStatus.idl
View File

@ -47,4 +47,5 @@ interface nsISSLStatus : nsISupports {
readonly attribute string cipherName;
readonly attribute unsigned long keyLength;
readonly attribute unsigned long secretKeyLength;
readonly attribute unsigned long protocolVersion;
};

20
security/manager/ssl/src/nsNSSCallbacks.cpp
View File

@ -659,6 +659,7 @@ public:
nsCOMPtr<nsIX509Cert> mServerCert;
PRUint32 mKeyLength;
PRUint32 mSecretKeyLength;
PRUint32 mProtocolVersion;
nsXPIDLCString mCipherName;
};
@ -693,6 +694,16 @@ nsSSLStatus::GetSecretKeyLength(PRUint32* _result)
return NS_OK;
}
NS_IMETHODIMP
nsSSLStatus::GetProtocolVersion(PRUint32* _result)
{
NS_ASSERTION(_result, "non-NULL destination required");
*_result = mProtocolVersion;
return NS_OK;
}
NS_IMETHODIMP
nsSSLStatus::GetCipherName(char** _result)
{
@ -704,7 +715,7 @@ nsSSLStatus::GetCipherName(char** _result)
}
nsSSLStatus::nsSSLStatus()
: mKeyLength(0), mSecretKeyLength(0)
: mKeyLength(0), mSecretKeyLength(0), mProtocolVersion(0)
{
}
@ -867,6 +878,13 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
status->mSecretKeyLength = encryptBits;
status->mCipherName.Adopt(cipherName);
SSLChannelInfo channelInfo;
if (SSL_GetChannelInfo(fd, &channelInfo, sizeof(channelInfo)) == SECSuccess) {
// Get the protocol version
// 0=ssl3, 1=tls1, 2=tls1.1, 3=tls1.2
status->mProtocolVersion = channelInfo.protocolVersion & 0xFF;
}
infoObject->SetSSLStatus(status);
}