From 8b81add9ccada8f07e5b6b96e80652dcaaa89277 Mon Sep 17 00:00:00 2001
From: romanett <romanett98@gmail.com>
Date: Tue, 11 Feb 2025 16:05:08 +0100
Subject: [PATCH] fix Token renewal (#2990)

---
 Stack/Opc.Ua.Core/Stack/Tcp/TcpServerChannel.cs          | 9 ++++++++-
 .../Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.Symmetric.cs | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/TcpServerChannel.cs b/Stack/Opc.Ua.Core/Stack/Tcp/TcpServerChannel.cs
index 869a907f6f..4ebcf1b28a 100644
--- a/Stack/Opc.Ua.Core/Stack/Tcp/TcpServerChannel.cs
+++ b/Stack/Opc.Ua.Core/Stack/Tcp/TcpServerChannel.cs
@@ -699,7 +699,14 @@ namespace Opc.Ua.Bindings
                 State = TcpChannelState.Open;
 
                 // send the response.
-                SendOpenSecureChannelResponse(requestId, CurrentToken, request);
+                if (requestType == SecurityTokenRequestType.Renew)
+                {
+                    SendOpenSecureChannelResponse(requestId, RenewedToken, request);
+                }
+                else
+                {
+                    SendOpenSecureChannelResponse(requestId, CurrentToken, request);
+                }
 
                 // notify reverse 
                 CompleteReverseHello(null);
diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.Symmetric.cs b/Stack/Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.Symmetric.cs
index ad118a2f3b..5b1dd2a6ff 100644
--- a/Stack/Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.Symmetric.cs
+++ b/Stack/Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.Symmetric.cs
@@ -72,7 +72,6 @@ namespace Opc.Ua.Bindings
             Utils.SilentDispose(m_previousToken);
             m_previousToken = m_currentToken;
             m_currentToken = token;
-            Utils.SilentDispose(m_renewedToken);
             m_renewedToken = null;
 
             OnTokenActivated?.Invoke(token, m_previousToken);