Change Array.Copy to Buffer.BlockCopy (#3)

Author: tpeczek

Lib.Net.Http.WebPush/Authentication/VapidAuthentication.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using Org.BouncyCastle.Math;
-using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Crypto.Signers;
 using Lib.Net.Http.WebPush.Internals;
 
@@ -59,11 +58,12 @@ internal WebPushSchemeHeadersValues(string authenticationHeaderValueParameter, s
         private string _subject;
         private string _publicKey;
         private string _privateKey;
-        private ECPrivateKeyParameters _privateSigningKey;
         private int _relativeExpiration;
 
         private static readonly DateTime _unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0);
         private static readonly string _jwtHeaderSegment = UrlBase64Converter.ToUrlBase64String(Encoding.UTF8.GetBytes(JWT_HEADER));
+
+        private ECDsaSigner _jwtSigner;
         #endregion
 
         #region Properties
@@ -140,7 +140,9 @@ public string PrivateKey
                 }
 
                 _privateKey = value;
-                _privateSigningKey = ECKeyHelper.GetECPrivateKeyParameters(decodedPrivateKey);
+
+                _jwtSigner = new ECDsaSigner();
+                _jwtSigner.Init(true, ECKeyHelper.GetECPrivateKeyParameters(decodedPrivateKey));
             }
         }
 
@@ -240,10 +242,7 @@ private string GenerateToken(string audience, DateTime absoluteExpiration)
                 jwtInputHash = sha256Hasher.ComputeHash(Encoding.UTF8.GetBytes(jwtInput));
             }
 
-            ECDsaSigner jwtSigner = new ECDsaSigner();
-            jwtSigner.Init(true, _privateSigningKey);
-
-            BigInteger[] jwtSignature = jwtSigner.GenerateSignature(jwtInputHash);
+            BigInteger[] jwtSignature = _jwtSigner.GenerateSignature(jwtInputHash);
 
             byte[] jwtSignatureFirstSegment = jwtSignature[0].ToByteArrayUnsigned();
             byte[] jwtSignatureSecondSegment = jwtSignature[1].ToByteArrayUnsigned();
@@ -289,7 +288,7 @@ private static void ByteArrayCopyWithPadLeft(byte[] sourceArray, byte[] destinat
                 destinationIndex += (destinationLengthToUse - sourceArray.Length);
             }
 
-            Array.Copy(sourceArray, 0, destinationArray, destinationIndex, sourceArray.Length);
+            Buffer.BlockCopy(sourceArray, 0, destinationArray, destinationIndex, sourceArray.Length);
         }
         #endregion
     }

Lib.Net.Http.WebPush/PushServiceClient.cs

@@ -297,14 +297,13 @@ private static byte[] GetKeyingMaterialInfoParameter(byte[] userAgentPublicKey,
             // "WebPush: info" || 0x00 || ua_public || as_public || 0x01
             byte[] infoParameter = new byte[_keyingMaterialInfoParameterPrefix.Length + userAgentPublicKey.Length + applicationServerPublicKey.Length + 2];
 
-            Array.Copy(_keyingMaterialInfoParameterPrefix, infoParameter, _keyingMaterialInfoParameterPrefix.Length);
+            Buffer.BlockCopy(_keyingMaterialInfoParameterPrefix, 0, infoParameter, 0, _keyingMaterialInfoParameterPrefix.Length);
             int infoParameterIndex = _keyingMaterialInfoParameterPrefix.Length + 1;
 
-            Array.Copy(userAgentPublicKey, 0, infoParameter, infoParameterIndex, userAgentPublicKey.Length);
+            Buffer.BlockCopy(userAgentPublicKey, 0, infoParameter, infoParameterIndex, userAgentPublicKey.Length);
             infoParameterIndex += userAgentPublicKey.Length;
 
-            Array.Copy(applicationServerPublicKey, 0, infoParameter, infoParameterIndex, applicationServerPublicKey.Length);
-
+            Buffer.BlockCopy(applicationServerPublicKey, 0, infoParameter, infoParameterIndex, applicationServerPublicKey.Length);
             infoParameter[infoParameter.Length - 1] = KEYING_MATERIAL_INFO_PARAMETER_DELIMITER;
 
             return infoParameter;