summary refs log tree commit diff
path: root/crypto/src/tls/SecurityParameters.cs
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/src/tls/SecurityParameters.cs')
-rw-r--r--crypto/src/tls/SecurityParameters.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/src/tls/SecurityParameters.cs b/crypto/src/tls/SecurityParameters.cs
index 84c3b9f11..f4aa1ac5a 100644
--- a/crypto/src/tls/SecurityParameters.cs
+++ b/crypto/src/tls/SecurityParameters.cs
@@ -22,6 +22,7 @@ namespace Org.BouncyCastle.Tls
         internal TlsSecret m_exporterMasterSecret = null;
         internal TlsSecret m_handshakeSecret = null;
         internal TlsSecret m_masterSecret = null;
+        internal TlsSecret m_preSharedKey = null;
         internal TlsSecret m_sharedSecret = null;
         internal TlsSecret m_trafficSecretClient = null;
         internal TlsSecret m_trafficSecretServer = null;
@@ -29,7 +30,6 @@ namespace Org.BouncyCastle.Tls
         internal byte[] m_serverRandom = null;
         internal byte[] m_sessionHash = null;
         internal byte[] m_sessionID = null;
-        internal byte[] m_psk = null;
         internal byte[] m_pskIdentity = null;
         internal byte[] m_srpIdentity = null;
         internal byte[] m_tlsServerEndPoint = null;
@@ -79,6 +79,7 @@ namespace Org.BouncyCastle.Tls
             this.m_exporterMasterSecret = ClearSecret(m_exporterMasterSecret);
             this.m_handshakeSecret = ClearSecret(m_handshakeSecret);
             this.m_masterSecret = ClearSecret(m_masterSecret);
+            this.m_preSharedKey = null;
             this.m_sharedSecret = ClearSecret(m_sharedSecret);
         }
 
@@ -227,6 +228,11 @@ namespace Org.BouncyCastle.Tls
             get { return m_peerVerifyData; }
         }
 
+        public TlsSecret PreSharedKey
+        {
+            get { return m_preSharedKey; }
+        }
+
         public int PrfAlgorithm
         {
             get { return m_prfAlgorithm; }
@@ -242,11 +248,6 @@ namespace Org.BouncyCastle.Tls
             get { return m_prfHashLength; }
         }
 
-        public byte[] Psk
-        {
-            get { return m_psk; }
-        }
-
         public byte[] PskIdentity
         {
             get { return m_pskIdentity; }