Revert to BouncyCastle for .NET Standard 2.0 support

Author: danielgindi

CorePush/Apple/ApnSender.cs

@@ -75,16 +75,18 @@ public async Task<ApnsResponse> SendAsync(
                 request.Headers.Add(apnidHeader, apnsId);
             }
 
-            using var response = await http.SendAsync(request);
-            var succeed = response.IsSuccessStatusCode;
-            var content = await response.Content.ReadAsStringAsync();
-            var error = JsonHelper.Deserialize<ApnsError>(content);
-
-            return new ApnsResponse
+            using (var response = await http.SendAsync(request))
             {
-                IsSuccess = succeed,
-                Error = error
-            };
+                var succeed = response.IsSuccessStatusCode;
+                var content = await response.Content.ReadAsStringAsync();
+                var error = JsonHelper.Deserialize<ApnsError>(content);
+
+                return new ApnsResponse
+                {
+                    IsSuccess = succeed,
+                    Error = error
+                };
+            }
         }
 
         private string GetJwtToken()
@@ -107,10 +109,12 @@ private string CreateJwtToken()
             var payloadBasae64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(payload));
             var unsignedJwtData = $"{headerBase64}.{payloadBasae64}";
             var unsignedJwtBytes = Encoding.UTF8.GetBytes(unsignedJwtData);
-            using var dsa = ECDsa.Create();
-            dsa.ImportPkcs8PrivateKey(Convert.FromBase64String(CleanP8Key(settings.P8PrivateKey)), out _);
-            var signature = dsa.SignData(unsignedJwtBytes, 0, unsignedJwtBytes.Length, HashAlgorithmName.SHA256);
-            return $"{unsignedJwtData}.{Convert.ToBase64String(signature)}";
+
+            using (var dsa = AppleCryptoHelper.GetEllipticCurveAlgorithm(CleanP8Key(settings.P8PrivateKey)))
+            {
+                var signature = dsa.SignData(unsignedJwtBytes, 0, unsignedJwtBytes.Length, HashAlgorithmName.SHA256);
+                return $"{unsignedJwtData}.{Convert.ToBase64String(signature)}";
+            }
         }
 
         private static int ToEpoch(DateTime time)

CorePush/CorePush.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Description>.NET Core C# Push Notifications for Android Google Firebase Messaging (FCM) and Apple push notifications (APN).</Description>
     <Authors>Andrei M</Authors>
     <Company />
@@ -39,6 +39,7 @@ Previous Versions:
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.9" />
   </ItemGroup>
-
+  
 </Project>

CorePush/Google/FcmSender.cs

@@ -39,15 +39,20 @@ public async Task<FcmResponse> SendAsync(string deviceId, object payload)
             jsonObject.Add("to", JToken.FromObject(deviceId));
             var json = jsonObject.ToString();
 
-            using var httpRequest = new HttpRequestMessage(HttpMethod.Post, fcmUrl);
-            httpRequest.Headers.Add("Authorization", $"key = {settings.ServerKey}");
-            httpRequest.Headers.Add("Sender", $"id = {settings.SenderId}");
-            httpRequest.Content = new StringContent(json, Encoding.UTF8, "application/json");
-            using var response = await http.SendAsync(httpRequest);
-            response.EnsureSuccessStatusCode();
-            var responseString = await response.Content.ReadAsStringAsync();
+            using (var httpRequest = new HttpRequestMessage(HttpMethod.Post, fcmUrl))
+            {
+                httpRequest.Headers.Add("Authorization", $"key = {settings.ServerKey}");
+                httpRequest.Headers.Add("Sender", $"id = {settings.SenderId}");
+                httpRequest.Content = new StringContent(json, Encoding.UTF8, "application/json");
 
-            return JsonHelper.Deserialize<FcmResponse>(responseString);
+                using (var response = await http.SendAsync(httpRequest))
+                {
+                    response.EnsureSuccessStatusCode();
+                    var responseString = await response.Content.ReadAsStringAsync();
+
+                    return JsonHelper.Deserialize<FcmResponse>(responseString);
+                }
+            }
         }
     }
 }

CorePush/Utils/AppleCryptoHelper.cs

@@ -0,0 +1,28 @@
+
+using System;
+using System.Security.Cryptography;
+using Org.BouncyCastle.Crypto.Parameters;	
+using Org.BouncyCastle.Security;
+
+namespace CorePush.Utils
+{
+    public static class AppleCryptoHelper
+    {
+        public static ECDsa GetEllipticCurveAlgorithm(string privateKey)	
+        {	
+            var keyParams = (ECPrivateKeyParameters) PrivateKeyFactory.CreateKey(Convert.FromBase64String(privateKey));	
+            var q = keyParams.Parameters.G.Multiply(keyParams.D).Normalize();	
+
+            return ECDsa.Create(new ECParameters	
+            {	
+                Curve = ECCurve.CreateFromValue(keyParams.PublicKeyParamSet.Id),	
+                D = keyParams.D.ToByteArrayUnsigned(),	
+                Q =	
+                {	
+                    X = q.XCoord.GetEncoded(),	
+                    Y = q.YCoord.GetEncoded()	
+                }	
+            });	
+        }
+    }
+}