Reduce Linq.Concat usage

Author: iamcarbon

Test/Attestation/FidoU2f.cs

@@ -33,15 +33,16 @@ public FidoU2f()
 
                     var x = _credentialPublicKey.GetCBORObject()[CBORObject.FromObject(COSE.KeyTypeParameter.X)].GetByteString();
                     var y = _credentialPublicKey.GetCBORObject()[CBORObject.FromObject(COSE.KeyTypeParameter.Y)].GetByteString();
-                    var publicKeyU2F = new byte[1] { 0x4 }.Concat(x).Concat(y).ToArray();
 
-                    var verificationData = new byte[1] { 0x00 };
-                    verificationData = verificationData
-                                        .Concat(_rpIdHash)
-                                        .Concat(_clientDataHash)
-                                        .Concat(_credentialID)
-                                        .Concat(publicKeyU2F.ToArray())
-                                        .ToArray();
+                    byte[] publicKeyU2F = DataHelper.Concat(new byte[1] { 0x4 }, x, y);
+                    
+                    byte[] verificationData = DataHelper.Concat(
+                        new byte[1] { 0x00 },
+                        _rpIdHash,
+                        _clientDataHash,
+                        _credentialID,
+                        publicKeyU2F
+                    );
 
                     byte[] signature = Fido2Tests.SignData(COSE.KeyType.EC2, COSE.Algorithm.ES256, verificationData, ecdsaAtt, null, null);
 

Test/Fido2Tests.cs

@@ -812,17 +812,19 @@ internal static byte[] CreateCertInfo(byte[] magic, byte[] type, byte[] qualifie
             byte[] extraData, byte[] clock, byte[] resetCount, byte[] restartCount,
             byte[] safe, byte[] firmwareRevision, byte[] tPM2BName, byte[] attestedQualifiedNameBuffer)
         {
-            IEnumerable<byte> raw = magic
-                .Concat(type)
-                .Concat(qualifiedSigner)
-                .Concat(extraData)
-                .Concat(clock)
-                .Concat(resetCount)
-                .Concat(restartCount)
-                .Concat(safe)
-                .Concat(firmwareRevision)
-                .Concat(tPM2BName)
-                .Concat(attestedQualifiedNameBuffer);
+            var raw = new MemoryStream();
+
+            raw.Write(magic);
+            raw.Write(type);
+            raw.Write(qualifiedSigner);
+            raw.Write(extraData);
+            raw.Write(clock);
+            raw.Write(resetCount);
+            raw.Write(restartCount);
+            raw.Write(safe);
+            raw.Write(firmwareRevision);
+            raw.Write(tPM2BName);
+            raw.Write(attestedQualifiedNameBuffer);
 
             return raw.ToArray();
         }