Made RestSharpJweEncryptionInterceptor internal, clean-up

jaaufauvre · jaaufauvre · commit 5a7c0cd9f4ff · 2021-12-30T16:07:02.000Z
diff --git a/Mastercard.Developer.ClientEncryption.Core/Encryption/AES/AesCbc.cs b/Mastercard.Developer.ClientEncryption.Core/Encryption/AES/AesCbc.cs
@@ -6,10 +6,8 @@
 
 namespace Mastercard.Developer.ClientEncryption.Core.Encryption.AES
 {
-    internal class AESCBC
+    internal static class AesCbc
     {
-        private AESCBC() { }
-
         public static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)
         {
             // Extract the encryption key
diff --git a/Mastercard.Developer.ClientEncryption.Core/Encryption/AES/AesGcm.cs b/Mastercard.Developer.ClientEncryption.Core/Encryption/AES/AesGcm.cs
@@ -6,27 +6,25 @@
 
 namespace Mastercard.Developer.ClientEncryption.Core.Encryption.AES
 {
-    internal class AESGCMAuthenticated
+    internal class AesGcmAuthenticated
     {
         public byte[] Ciphertext { get; private set; }
         public byte[] AuthTag { get; private set; }
 
-        internal AESGCMAuthenticated(byte[] ciphertext, byte[] authTag)
+        internal AesGcmAuthenticated(byte[] ciphertext, byte[] authTag)
         {
             Ciphertext = ciphertext;
             AuthTag = authTag;
         }
     }
 
-    class AESGCM
+    internal static class AesGcm
     {
-        private AESGCM() { }
-
         internal static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)
         {
 #if NETSTANDARD2_1
             byte[] plaintext;
-            using (var aes = new AesGcm(secretKeyBytes))
+            using (var aes = new System.Security.Cryptography.AesGcm(secretKeyBytes))
             {
                 byte[] nonce = Base64Utils.URLDecode(jweObject.Iv);
                 byte[] aad = Encoding.ASCII.GetBytes(jweObject.RawHeader);
@@ -42,16 +40,16 @@ internal static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)
 #endif
         }
 
-        internal static AESGCMAuthenticated Encrypt(byte[] secretKeyBytes, byte[] nonce, byte[] plaintext, byte[] aad)
+        internal static AesGcmAuthenticated Encrypt(byte[] secretKeyBytes, byte[] nonce, byte[] plaintext, byte[] aad)
         {
 #if NETSTANDARD2_1
             byte[] ciphertext = new byte[plaintext.Length];
-            byte[] authTag = new byte[AesGcm.TagByteSizes.MaxSize];
-            using (var aes = new AesGcm(secretKeyBytes))
+            byte[] authTag = new byte[System.Security.Cryptography.AesGcm.TagByteSizes.MaxSize];
+            using (var aes = new System.Security.Cryptography.AesGcm(secretKeyBytes))
             {
                 aes.Encrypt(nonce, plaintext, ciphertext, authTag, aad);
             }
-            return new AESGCMAuthenticated(ciphertext, authTag);
+            return new AesGcmAuthenticated(ciphertext, authTag);
 #else
             throw new EncryptionException("AES/GCM/NoPadding is unsupported on .NET Standard < 2.1");
 #endif
diff --git a/Mastercard.Developer.ClientEncryption.Core/Encryption/JWE/JweEncryption.cs b/Mastercard.Developer.ClientEncryption.Core/Encryption/JWE/JweEncryption.cs
@@ -6,14 +6,12 @@
 
 namespace Mastercard.Developer.ClientEncryption.Core.Encryption.JWE
 {
-    public class JweEncryption
+    public static class JweEncryption
     {
         private const string ALGORITHM = "RSA-OAEP-256";
         private const string ENCRYPTION = "A256GCM";
         private const string CONTENT_TYPE = "application/json";
 
-        internal JweEncryption() { }
-
         public static string EncryptPayload(string payload, JweConfig config)
         {
             try
diff --git a/Mastercard.Developer.ClientEncryption.Core/Encryption/JWE/JweObject.cs b/Mastercard.Developer.ClientEncryption.Core/Encryption/JWE/JweObject.cs
@@ -32,11 +32,11 @@ public string Decrypt(JweConfig config)
             byte[] plaintext;
             if (A256GCM.Equals(encryptionMethod))
             {
-                plaintext = AESGCM.Decrypt(unwrappedKey, this);
+                plaintext = AesGcm.Decrypt(unwrappedKey, this);
             }
             else if (A128CBC_HS256.Equals(encryptionMethod))
             {
-                plaintext = AESCBC.Decrypt(unwrappedKey, this);
+                plaintext = AesCbc.Decrypt(unwrappedKey, this);
             }
             else
             {
@@ -58,7 +58,7 @@ public static string Encrypt(JweConfig config, String payload, JweHeader header)
             string encodedHeader = Base64Utils.URLEncode(Encoding.UTF8.GetBytes(headerString));
             byte[] aad = Encoding.ASCII.GetBytes(encodedHeader);
 
-            var encrypted = AESGCM.Encrypt(cek, iv, payloadBytes, aad);
+            var encrypted = AesGcm.Encrypt(cek, iv, payloadBytes, aad);
             return Serialize(encodedHeader, encryptedKey, Base64Utils.URLEncode(iv), Base64Utils.URLEncode(encrypted.Ciphertext), Base64Utils.URLEncode(encrypted.AuthTag));
         }
 
diff --git a/Mastercard.Developer.ClientEncryption.Core/Utils/Base64Utils.cs b/Mastercard.Developer.ClientEncryption.Core/Utils/Base64Utils.cs
@@ -2,7 +2,7 @@
 
 namespace Mastercard.Developer.ClientEncryption.Core.Utils
 {
-    class Base64Utils
+    internal static class Base64Utils
     {
         // c.f. https://datatracker.ietf.org/doc/html/rfc7515#appendix-C
         internal static string URLEncode(byte[] bytes)
diff --git a/Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpEncryptionInterceptor.cs b/Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpEncryptionInterceptor.cs
@@ -12,11 +12,6 @@ namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors
     /// </summary>
     public abstract class RestSharpEncryptionInterceptor
     {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        internal RestSharpEncryptionInterceptor() {  }
-
         /// <summary>
         /// 
         /// </summary>
@@ -143,7 +138,7 @@ internal static void UpdateResponseHeader(IRestResponse response, string name, o
             }
 
             // If we get here, there is no such header, so add one
-            Parameter header = new Parameter(name, value.ToString(), ParameterType.HttpHeader);
+            var header = new Parameter(name, value.ToString(), ParameterType.HttpHeader);
             response.Headers.Add(header);
         }
 
diff --git a/Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpJweEncryptionInterceptor.cs b/Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpJweEncryptionInterceptor.cs
@@ -8,7 +8,7 @@ namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors
     /// A class for encrypting RestSharp requests and decrypting RestSharp responses,
     /// using JSON Web Encryption.
     /// </summary>
-    public class RestSharpJweEncryptionInterceptor : RestSharpEncryptionInterceptor
+    internal class RestSharpJweEncryptionInterceptor : RestSharpEncryptionInterceptor
     {
         private readonly JweConfig _config;
 
diff --git a/Mastercard.Developer.ClientEncryption.RestSharpV2/Mastercard.Developer.ClientEncryption.RestSharpV2.csproj b/Mastercard.Developer.ClientEncryption.RestSharpV2/Mastercard.Developer.ClientEncryption.RestSharpV2.csproj
@@ -41,4 +41,27 @@
     <ProjectReference Include="..\Mastercard.Developer.ClientEncryption.Core\Mastercard.Developer.ClientEncryption.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+    <_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+    <_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>  
+  
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+    <_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net4x, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+    <_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net5, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
diff --git a/Mastercard.Developer.ClientEncryption.Tests/Net4x/Mastercard.Developer.ClientEncryption.Tests.Net4x.csproj b/Mastercard.Developer.ClientEncryption.Tests/Net4x/Mastercard.Developer.ClientEncryption.Tests.Net4x.csproj
@@ -72,20 +72,20 @@
     <Compile Include="..\NetCore2\Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs">
       <Link>Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Encryption\JWE\GCMJweObjectTest.cs">
-      <Link>Encryption\JWE\GCMJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\GcmJweObjectTest.cs">
+      <Link>Encryption\JWE\GcmJweObjectTest.cs</Link>
     </Compile>
     <Compile Include="..\NetCore2\Encryption\JWE\JweHeaderTest.cs">
       <Link>Encryption\JWE\JweHeaderTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Encryption\JWE\CBCJweObjectTest.cs">
-      <Link>Encryption\JWE\CBCJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\CbcJweObjectTest.cs">
+      <Link>Encryption\JWE\CbcJweObjectTest.cs</Link>
     </Compile>
     <Compile Include="..\NetCore2\Encryption\RSA\RsaEncryptionTest.cs">
       <Link>Encryption\RSA\RsaEncryptionTest.cs</Link>
diff --git a/Mastercard.Developer.ClientEncryption.Tests/Net5/Mastercard.Developer.ClientEncryption.Tests.Net5.csproj b/Mastercard.Developer.ClientEncryption.Tests/Net5/Mastercard.Developer.ClientEncryption.Tests.Net5.csproj
@@ -46,17 +46,17 @@
     <Compile Include="..\NetCore2\Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs">
       <Link>Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Encryption\JWE\CBCJweObjectTest.cs">
-        <Link>Encryption\JWE\CBCJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\CbcJweObjectTest.cs">
+        <Link>Encryption\JWE\CbcJweObjectTest.cs</Link>
     </Compile> 
-    <Compile Include="..\NetCore2\Encryption\JWE\GCMJweObjectTest.cs">
-        <Link>Encryption\JWE\GCMJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\GcmJweObjectTest.cs">
+        <Link>Encryption\JWE\GcmJweObjectTest.cs</Link>
     </Compile> 
     <Compile Include="..\NetCore2\Encryption\JWE\JweHeaderTest.cs">
         <Link>Encryption\JWE\JweHeaderTest.cs</Link>
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Encryption/JWE/CbcJweObjectTest.cs b/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Encryption/JWE/CbcJweObjectTest.cs
@@ -6,7 +6,7 @@
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Encryption.JWE
 {
     [TestClass]
-    public class CBCJweObjectTest
+    public class CbcJweObjectTest
     {
         [TestMethod]
         public void TestDecrypt_ShouldReturnDecryptedPayload_WhenPayloadIsCbcEncrypted()
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Encryption/JWE/GcmJweObjectTest.cs b/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Encryption/JWE/GcmJweObjectTest.cs
@@ -7,7 +7,7 @@
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Encryption.JWE
 {
     [TestClass]
-    public class GCMJweObjectTest
+    public class GcmJweObjectTest
     {
         [TestMethod]
 #if !NETCOREAPP3_1 && !NET5_0_OR_GREATER
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2CbcJweEncryptionInterceptorTest.cs b/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2CbcJweEncryptionInterceptorTest.cs
@@ -12,7 +12,7 @@
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Interceptors
 {
     [TestClass]
-    public class RestSharpV2CBCJweEncryptionInterceptorTest
+    public class RestSharpV2CbcJweEncryptionInterceptorTest
     {
         [TestMethod]
         public void TestFrom_ShouldReturnTheCorrectInterceptor()
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2FieldLevelEncryptionInterceptorTest.cs b/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2FieldLevelEncryptionInterceptorTest.cs
@@ -24,12 +24,9 @@ public void TestInterceptRequest_ShouldEncryptRequestPayloadAndUpdateContentLeng
             var request = new RestRequest
             {
                 Method = Method.POST,
-                Resource = "/service",
-                Parameters =
-                {
-                    new Parameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody)
-                }
+                Resource = "/service"
             };
+            request.AddParameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody);
 
             // WHEN
             var instanceUnderTest = new RestSharpFieldLevelEncryptionInterceptor(config);
@@ -77,12 +74,9 @@ public void TestInterceptRequest_ShouldThrowEncryptionException_WhenEncryptionFa
             var request = new RestRequest
             {
                 Method = Method.POST,
-                Resource = "/service",
-                Parameters =
-                {
-                    new Parameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody )
-                }
+                Resource = "/service"
             };
+            request.AddParameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody);
 
             try
             {
@@ -184,12 +178,9 @@ public void TestInterceptRequest_ShouldEncryptRequestPayloadAndAddEncryptionHttp
             var request = new RestRequest
             {
                 Method = Method.POST,
-                Resource = "/service",
-                Parameters =
-                {
-                    new Parameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody )
-                }
+                Resource = "/service"
             };
+            request.AddParameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody);
 
             // WHEN
             var instanceUnderTest = new RestSharpFieldLevelEncryptionInterceptor(config);
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2GcmJweEncryptionInterceptorTest.cs b/Mastercard.Developer.ClientEncryption.Tests/NetCore2/Interceptors/RestSharpV2GcmJweEncryptionInterceptorTest.cs
@@ -12,7 +12,7 @@
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Interceptors
 {
     [TestClass]
-    public class RestSharpV2GCMJweEncryptionInterceptorTest
+    public class RestSharpV2GcmJweEncryptionInterceptorTest
     {
         [TestMethod]
 #if !NETCOREAPP3_1 && !NET5_0_OR_GREATER
@@ -28,12 +28,9 @@ public void TestIntercept_ShouldEncryptRequestPayloadAndUpdateContentLengthHeade
             var request = new RestRequest
             {
                 Method = Method.POST,
-                Resource = "/service",
-                Parameters =
-                {
-                    new Parameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody)
-                }
+                Resource = "/service"
             };
+            request.AddParameter("param1", "{\"foo\":\"bar\"}", ParameterType.RequestBody);
 
             // WHEN
             var fixture = RestSharpEncryptionInterceptor.From(config);
@@ -65,7 +62,7 @@ public void TestInterceptResponse_ShouldDecryptResponsePayloadAndUpdateContentLe
                 .Build();
 
             // WHEN
-            var response = RestSharpV2CBCJweEncryptionInterceptorTest.RestResponseWithContentLength(encryptedPayload);
+            var response = RestSharpV2CbcJweEncryptionInterceptorTest.RestResponseWithContentLength(encryptedPayload);
             var fixture = RestSharpEncryptionInterceptor.From(config);
             fixture.InterceptResponse(response);
 
diff --git a/Mastercard.Developer.ClientEncryption.Tests/NetCore3/Mastercard.Developer.ClientEncryption.Tests.NetCore3.csproj b/Mastercard.Developer.ClientEncryption.Tests/NetCore3/Mastercard.Developer.ClientEncryption.Tests.NetCore3.csproj
@@ -46,17 +46,17 @@
     <Compile Include="..\NetCore2\Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs">
       <Link>Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2CBCJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs">
-      <Link>Interceptors\RestSharpV2GCMJweEncryptionInterceptorTest.cs</Link>
+    <Compile Include="..\NetCore2\Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs">
+      <Link>Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs</Link>
     </Compile>
-    <Compile Include="..\NetCore2\Encryption\JWE\CBCJweObjectTest.cs">
-        <Link>Encryption\JWE\CBCJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\CbcJweObjectTest.cs">
+        <Link>Encryption\JWE\CbcJweObjectTest.cs</Link>
     </Compile> 
-    <Compile Include="..\NetCore2\Encryption\JWE\GCMJweObjectTest.cs">
-        <Link>Encryption\JWE\GCMJweObjectTest.cs</Link>
+    <Compile Include="..\NetCore2\Encryption\JWE\GcmJweObjectTest.cs">
+        <Link>Encryption\JWE\GcmJweObjectTest.cs</Link>
     </Compile> 
     <Compile Include="..\NetCore2\Encryption\JWE\JweHeaderTest.cs">
         <Link>Encryption\JWE\JweHeaderTest.cs</Link>

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Mastercard.Developer.ClientEncryption.Core.Encryption.AES`
`8`	`8`	`{`
`9`		`- internal class AESCBC`
	`9`	`+ internal static class AesCbc`
`10`	`10`	`{`
`11`		`- private AESCBC() { }`
`12`		`-`
`13`	`11`	`public static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)`
`14`	`12`	`{`
`15`	`13`	`// Extract the encryption key`
Original file line number	Diff line number	Diff line change
`@@ -6,27 +6,25 @@`
`6`	`6`
`7`	`7`	`namespace Mastercard.Developer.ClientEncryption.Core.Encryption.AES`
`8`	`8`	`{`
`9`		`- internal class AESGCMAuthenticated`
	`9`	`+ internal class AesGcmAuthenticated`
`10`	`10`	`{`
`11`	`11`	`public byte[] Ciphertext { get; private set; }`
`12`	`12`	`public byte[] AuthTag { get; private set; }`
`13`	`13`
`14`		`- internal AESGCMAuthenticated(byte[] ciphertext, byte[] authTag)`
	`14`	`+ internal AesGcmAuthenticated(byte[] ciphertext, byte[] authTag)`
`15`	`15`	`{`
`16`	`16`	`Ciphertext = ciphertext;`
`17`	`17`	`AuthTag = authTag;`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`- class AESGCM`
	`21`	`+ internal static class AesGcm`
`22`	`22`	`{`
`23`		`- private AESGCM() { }`
`24`		`-`
`25`	`23`	`internal static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)`
`26`	`24`	`{`
`27`	`25`	`#if NETSTANDARD2_1`
`28`	`26`	`byte[] plaintext;`
`29`		`- using (var aes = new AesGcm(secretKeyBytes))`
	`27`	`+ using (var aes = new System.Security.Cryptography.AesGcm(secretKeyBytes))`
`30`	`28`	`{`
`31`	`29`	`byte[] nonce = Base64Utils.URLDecode(jweObject.Iv);`
`32`	`30`	`byte[] aad = Encoding.ASCII.GetBytes(jweObject.RawHeader);`
`@@ -42,16 +40,16 @@ internal static byte[] Decrypt(byte[] secretKeyBytes, JweObject jweObject)`
`42`	`40`	`#endif`
`43`	`41`	`}`
`44`	`42`
`45`		`- internal static AESGCMAuthenticated Encrypt(byte[] secretKeyBytes, byte[] nonce, byte[] plaintext, byte[] aad)`
	`43`	`+ internal static AesGcmAuthenticated Encrypt(byte[] secretKeyBytes, byte[] nonce, byte[] plaintext, byte[] aad)`
`46`	`44`	`{`
`47`	`45`	`#if NETSTANDARD2_1`
`48`	`46`	`byte[] ciphertext = new byte[plaintext.Length];`
`49`		`- byte[] authTag = new byte[AesGcm.TagByteSizes.MaxSize];`
`50`		`- using (var aes = new AesGcm(secretKeyBytes))`
	`47`	`+ byte[] authTag = new byte[System.Security.Cryptography.AesGcm.TagByteSizes.MaxSize];`
	`48`	`+ using (var aes = new System.Security.Cryptography.AesGcm(secretKeyBytes))`
`51`	`49`	`{`
`52`	`50`	`aes.Encrypt(nonce, plaintext, ciphertext, authTag, aad);`
`53`	`51`	`}`
`54`		`- return new AESGCMAuthenticated(ciphertext, authTag);`
	`52`	`+ return new AesGcmAuthenticated(ciphertext, authTag);`
`55`	`53`	`#else`
`56`	`54`	`throw new EncryptionException("AES/GCM/NoPadding is unsupported on .NET Standard < 2.1");`
`57`	`55`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,12 @@`
`6`	`6`
`7`	`7`	`namespace Mastercard.Developer.ClientEncryption.Core.Encryption.JWE`
`8`	`8`	`{`
`9`		`- public class JweEncryption`
	`9`	`+ public static class JweEncryption`
`10`	`10`	`{`
`11`	`11`	`private const string ALGORITHM = "RSA-OAEP-256";`
`12`	`12`	`private const string ENCRYPTION = "A256GCM";`
`13`	`13`	`private const string CONTENT_TYPE = "application/json";`
`14`	`14`
`15`		`- internal JweEncryption() { }`
`16`		`-`
`17`	`15`	`public static string EncryptPayload(string payload, JweConfig config)`
`18`	`16`	`{`
`19`	`17`	`try`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ public string Decrypt(JweConfig config)`
`32`	`32`	`byte[] plaintext;`
`33`	`33`	`if (A256GCM.Equals(encryptionMethod))`
`34`	`34`	`{`
`35`		`- plaintext = AESGCM.Decrypt(unwrappedKey, this);`
	`35`	`+ plaintext = AesGcm.Decrypt(unwrappedKey, this);`
`36`	`36`	`}`
`37`	`37`	`else if (A128CBC_HS256.Equals(encryptionMethod))`
`38`	`38`	`{`
`39`		`- plaintext = AESCBC.Decrypt(unwrappedKey, this);`
	`39`	`+ plaintext = AesCbc.Decrypt(unwrappedKey, this);`
`40`	`40`	`}`
`41`	`41`	`else`
`42`	`42`	`{`
`@@ -58,7 +58,7 @@ public static string Encrypt(JweConfig config, String payload, JweHeader header)`
`58`	`58`	`string encodedHeader = Base64Utils.URLEncode(Encoding.UTF8.GetBytes(headerString));`
`59`	`59`	`byte[] aad = Encoding.ASCII.GetBytes(encodedHeader);`
`60`	`60`
`61`		`- var encrypted = AESGCM.Encrypt(cek, iv, payloadBytes, aad);`
	`61`	`+ var encrypted = AesGcm.Encrypt(cek, iv, payloadBytes, aad);`
`62`	`62`	`return Serialize(encodedHeader, encryptedKey, Base64Utils.URLEncode(iv), Base64Utils.URLEncode(encrypted.Ciphertext), Base64Utils.URLEncode(encrypted.AuthTag));`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Mastercard.Developer.ClientEncryption.Core.Utils`
`4`	`4`	`{`
`5`		`- class Base64Utils`
	`5`	`+ internal static class Base64Utils`
`6`	`6`	`{`
`7`	`7`	`// c.f. https://datatracker.ietf.org/doc/html/rfc7515#appendix-C`
`8`	`8`	`internal static string URLEncode(byte[] bytes)`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,6 @@ namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors`
`12`	`12`	`/// </summary>`
`13`	`13`	`public abstract class RestSharpEncryptionInterceptor`
`14`	`14`	`{`
`15`		`- /// <summary>`
`16`		`- /// Constructor.`
`17`		`- /// </summary>`
`18`		`- internal RestSharpEncryptionInterceptor() { }`
`19`		`-`
`20`	`15`	`/// <summary>`
`21`	`16`	`///`
`22`	`17`	`/// </summary>`
`@@ -143,7 +138,7 @@ internal static void UpdateResponseHeader(IRestResponse response, string name, o`
`143`	`138`	`}`
`144`	`139`
`145`	`140`	`// If we get here, there is no such header, so add one`
`146`		`- Parameter header = new Parameter(name, value.ToString(), ParameterType.HttpHeader);`
	`141`	`+ var header = new Parameter(name, value.ToString(), ParameterType.HttpHeader);`
`147`	`142`	`response.Headers.Add(header);`
`148`	`143`	`}`
`149`	`144`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors`
`8`	`8`	`/// A class for encrypting RestSharp requests and decrypting RestSharp responses,`
`9`	`9`	`/// using JSON Web Encryption.`
`10`	`10`	`/// </summary>`
`11`		`- public class RestSharpJweEncryptionInterceptor : RestSharpEncryptionInterceptor`
	`11`	`+ internal class RestSharpJweEncryptionInterceptor : RestSharpEncryptionInterceptor`
`12`	`12`	`{`
`13`	`13`	`private readonly JweConfig _config;`
`14`	`14`