diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2021-07-27 17:36:09 +0700 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2021-07-27 17:36:09 +0700 |
commit | 6394a2e60292d0f0a20e74f66a28a8a10e8691a2 (patch) | |
tree | 43683c82a63640071e9ac1285dc73a1d69dd1300 /crypto/src/tls/TlsServerProtocol.cs | |
parent | Use PSK early secret when negotiated (diff) | |
download | BouncyCastle.NET-ed25519-6394a2e60292d0f0a20e74f66a28a8a10e8691a2.tar.xz |
Add pre_shared_key to ClientHello
Diffstat (limited to 'crypto/src/tls/TlsServerProtocol.cs')
-rw-r--r-- | crypto/src/tls/TlsServerProtocol.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crypto/src/tls/TlsServerProtocol.cs b/crypto/src/tls/TlsServerProtocol.cs index 2afb625a8..89365afad 100644 --- a/crypto/src/tls/TlsServerProtocol.cs +++ b/crypto/src/tls/TlsServerProtocol.cs @@ -309,6 +309,11 @@ namespace Org.BouncyCastle.Tls this.m_expectSessionTicket = false; + // TODO[tls13-psk] Use PSK early secret if negotiated + TlsSecret pskEarlySecret = null; + + TlsSecret sharedSecret = null; + { int namedGroup = clientShare.NamedGroup; @@ -331,14 +336,11 @@ namespace Org.BouncyCastle.Tls TlsExtensionsUtilities.AddKeyShareServerHello(serverHelloExtensions, serverShare); agreement.ReceivePeerValue(clientShare.KeyExchange); - securityParameters.m_sharedSecret = agreement.CalculateSecret(); - - // TODO[tls13-psk] Use PSK early secret if negotiated - TlsSecret pskEarlySecret = null; - - TlsUtilities.Establish13PhaseSecrets(m_tlsServerContext, pskEarlySecret); + sharedSecret = agreement.CalculateSecret(); } + TlsUtilities.Establish13PhaseSecrets(m_tlsServerContext, pskEarlySecret, sharedSecret); + this.m_serverExtensions = serverEncryptedExtensions; ApplyMaxFragmentLengthExtension(securityParameters.MaxFragmentLength); |