summary refs log tree commit diff
path: root/crypto/src/crypto/tls/TlsUtilities.cs
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2018-11-06 16:55:58 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2018-11-06 16:55:58 +0700
commitae809eddc05da059ff401787e17fb3e96cd4fe64 (patch)
tree8b38a1e0a42be0647205079c893c25b8621f2b24 /crypto/src/crypto/tls/TlsUtilities.cs
parentUpdate versions and release notes for 1.8.4 (diff)
downloadBouncyCastle.NET-ed25519-ae809eddc05da059ff401787e17fb3e96cd4fe64.tar.xz
TLS: Update to RFC 7627 from draft-ietf-tls-session-hash-04
Diffstat (limited to 'crypto/src/crypto/tls/TlsUtilities.cs')
-rw-r--r--crypto/src/crypto/tls/TlsUtilities.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/src/crypto/tls/TlsUtilities.cs b/crypto/src/crypto/tls/TlsUtilities.cs

index 698bf6da6..e6bd253aa 100644 --- a/crypto/src/crypto/tls/TlsUtilities.cs +++ b/crypto/src/crypto/tls/TlsUtilities.cs
@@ -963,14 +963,14 @@ namespace Org.BouncyCastle.Crypto.Tls { SecurityParameters securityParameters = context.SecurityParameters; - byte[] seed = securityParameters.extendedMasterSecret + byte[] seed = securityParameters.IsExtendedMasterSecret ? securityParameters.SessionHash : Concat(securityParameters.ClientRandom, securityParameters.ServerRandom); if (IsSsl(context)) return CalculateMasterSecret_Ssl(pre_master_secret, seed); - string asciiLabel = securityParameters.extendedMasterSecret + string asciiLabel = securityParameters.IsExtendedMasterSecret ? ExporterLabel.extended_master_secret : ExporterLabel.master_secret;