Minor refactor of class visibility

Author: jdomnitz

MatterDotNet/Constants.cs

@@ -12,11 +12,27 @@
 
 namespace MatterDotNet
 {
+    /// <summary>
+    /// Assorted Matter Specification constant values
+    /// </summary>
     public class Constants
     {
+        /// <summary>
+        /// Matter 1.0 Revision
+        /// </summary>
         public const int MATTER_10_REVISION = 10;
+        /// <summary>
+        /// Matter 1.2 Revision
+        /// </summary>
         public const int MATTER_12_REVISION = 11;
+        /// <summary>
+        /// Matter 1.3 Revision
+        /// </summary>
         public const int MATTER_13_REVISION = 12;
+        /// <summary>
+        /// Matter 1.4 Revision
+        /// </summary>
+        public const int MATTER_14_REVISION = 13;
 
         /// <summary>
         /// The current limit of 900 bytes was chosen to accommodate the maximum size of IPv6 frames, transport headers, 

MatterDotNet/Protocol/Connection/IConnection.cs

@@ -15,7 +15,7 @@
 
 namespace MatterDotNet.Protocol.Connection
 {
-    public interface IConnection : IDisposable
+    internal interface IConnection : IDisposable
     {
         Task<Frame> Read();
         Task SendFrame(Exchange exchange, Frame frame, bool reliable);

MatterDotNet/Protocol/Connection/MRPConnection.cs

@@ -21,7 +21,7 @@
 
 namespace MatterDotNet.Protocol.Connection
 {
-    public class MRPConnection : IConnection
+    internal class MRPConnection : IConnection
     {
         private static readonly TimeSpan MRP_STANDALONE_ACK_TIMEOUT = TimeSpan.FromMilliseconds(200);
         private const int MRP_BACKOFF_THRESHOLD = 1;

MatterDotNet/Protocol/Connection/Retransmission.cs

@@ -15,7 +15,7 @@
 
 namespace MatterDotNet.Protocol.Connection
 {
-    public record Retransmission (Exchange Exchange, uint Counter, PayloadWriter data)
+    internal record Retransmission (Exchange Exchange, uint Counter, PayloadWriter data)
     {
         public SemaphoreSlim Ack { get; init; } = new SemaphoreSlim(0);
         public int SendCount { get; set; }

MatterDotNet/Protocol/Connection/TCPConnection.cs

@@ -19,7 +19,7 @@
 
 namespace MatterDotNet.Protocol.Connection
 {
-    public class TCPConnection : IConnection
+    internal class TCPConnection : IConnection
     {
         TcpClient client;
         NetworkStream stream;

MatterDotNet/Protocol/Cryptography/Crypto.cs

@@ -13,7 +13,6 @@
 using MatterDotNet.Security;
 using System.Buffers.Binary;
 using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
 
 namespace MatterDotNet.Protocol.Cryptography
 {
@@ -57,12 +56,12 @@ public static ReadOnlySpan<byte> AEAD_GenerateEncrypt(byte[] key, Span<byte> pay
         /// <param name="additionalData"></param>
         /// <param name="nonce"></param>
         /// <returns></returns>
-        public static bool AEAD_DecryptVerify(byte[] key, Span<byte> payload, ReadOnlySpan<byte> mic, ReadOnlySpan<byte> additionalData, ReadOnlySpan<byte> nonce)
+        public static bool AEAD_DecryptVerify(byte[] key, Span<byte> payload, ReadOnlySpan<byte> additionalData, ReadOnlySpan<byte> nonce)
         {
             try
             {
                 AesCcm aes = new AesCcm(key);
-                aes.Decrypt(nonce, payload, mic, payload, additionalData);
+                aes.Decrypt(nonce, payload.Slice(0, payload.Length - AEAD_MIC_LENGTH_BYTES), payload.Slice(payload.Length - AEAD_MIC_LENGTH_BYTES, AEAD_MIC_LENGTH_BYTES), payload.Slice(0, payload.Length - AEAD_MIC_LENGTH_BYTES), additionalData);
                 return true;
             }
             catch (CryptographicException)

MatterDotNet/Protocol/InteractionManager.cs

@@ -19,7 +19,7 @@
 
 namespace MatterDotNet.Protocol
 {
-    public class InteractionManager
+    internal class InteractionManager
     {
         public static async Task<List<AttributeReportIB>> GetAttributes(SecureSession session, ushort endpoint, uint cluster, params uint[] attributes)
         {

MatterDotNet/Protocol/Payloads/Frame.cs

@@ -19,7 +19,7 @@
 
 namespace MatterDotNet.Protocol.Payloads
 {
-    public class Frame
+    internal class Frame
     {
         internal const int MAX_SIZE = 1280;
         internal static readonly byte[] PRIVACY_INFO = Encoding.UTF8.GetBytes("PrivacyKey");
@@ -156,8 +156,7 @@ public Frame(Span<byte> payload)
                 //TODO: For a CASE session, the Nonce Source Node ID SHALL be determined via the Secure Session Context associated with the Session Identifier.
 
                 if (Crypto.AEAD_DecryptVerify(session.Initiator ? session.R2IKey : session.I2RKey,
-                                          slice.Slice(0, slice.Length - Crypto.AEAD_MIC_LENGTH_BYTES),
-                                          slice.Slice(slice.Length - Crypto.AEAD_MIC_LENGTH_BYTES, Crypto.AEAD_MIC_LENGTH_BYTES),
+                                          slice,
                                           payload.Slice(0, payload.Length - slice.Length),
                                           nonce))
                     Message = new Version1Payload(slice.Slice(0, slice.Length - Crypto.AEAD_MIC_LENGTH_BYTES));

MatterDotNet/Protocol/Sessions/Exchange.cs

@@ -15,7 +15,7 @@
 
 namespace MatterDotNet.Protocol.Sessions
 {
-    public class Exchange : IDisposable
+    internal class Exchange : IDisposable
     {
         private const int MSG_COUNTER_WINDOW_SIZE = 32;
 

MatterDotNet/Protocol/Sessions/SecureSession.cs

@@ -31,7 +31,7 @@ public class SecureSession : SessionContext
         public uint ActiveThreshold { get; init; }
         public bool PeerActive { get { return (DateTime.Now - LastActive).TotalMilliseconds < SessionManager.GetDefaultSessionParams().SessionActiveThreshold; } }
 
-        public SecureSession(IConnection connection, bool PASE, bool initiator, ushort localSessionID, ushort remoteSessionID, byte[] i2rKey, byte[] r2iKey, byte[] sharedSecret, uint localMessageCounter, MessageState remoteMessageCounter, ulong initiatorNodeId, ulong peerNodeId, uint sessionIdleInterval, uint sessionActiveInterval, uint sessionActiveThreshold) : base(connection, initiator, initiatorNodeId, peerNodeId, localSessionID, remoteSessionID, remoteMessageCounter)
+        internal SecureSession(IConnection connection, bool PASE, bool initiator, ushort localSessionID, ushort remoteSessionID, byte[] i2rKey, byte[] r2iKey, byte[] sharedSecret, uint localMessageCounter, MessageState remoteMessageCounter, ulong initiatorNodeId, ulong peerNodeId, uint sessionIdleInterval, uint sessionActiveInterval, uint sessionActiveThreshold) : base(connection, initiator, initiatorNodeId, peerNodeId, localSessionID, remoteSessionID, remoteMessageCounter)
         {
             this.PASE = PASE;
             I2RKey = i2rKey;