Throw proper errors in PasswordBasedKeyExporter

ektrah · May 4, 2024 · 7a3273f · 7a3273f
1 parent 665e72a
commit 7a3273f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/Cryptography/Error.cs b/src/Cryptography/Error.cs
@@ -252,6 +252,12 @@ internal static ArgumentNullException ArgumentNull_Password(
             return new ArgumentNullException(paramName, ResourceManager.GetString(nameof(ArgumentNull_Password)));
         }
 
+        internal static ArgumentNullException ArgumentNull_Scheme(
+            string paramName)
+        {
+            return new ArgumentNullException(paramName, ResourceManager.GetString(nameof(ArgumentNull_Scheme)));
+        }
+
         internal static ArgumentNullException ArgumentNull_SharedSecret(
             string paramName)
         {

diff --git a/src/Cryptography/Error.resx b/src/Cryptography/Error.resx
@@ -126,6 +126,9 @@
   <data name="ArgumentNull_Password" xml:space="preserve">
     <value>Password cannot be null.</value>
   </data>
+  <data name="ArgumentNull_Scheme" xml:space="preserve">
+    <value>Encryption scheme cannot be null.</value>
+  </data>
   <data name="ArgumentNull_SharedSecret" xml:space="preserve">
     <value>Shared secret cannot be null.</value>
   </data>

diff --git a/src/Experimental/PasswordBased/PasswordBasedKeyExporter.cs b/src/Experimental/PasswordBased/PasswordBasedKeyExporter.cs
@@ -14,7 +14,7 @@ public static byte[] Export(
         {
             if (key == null)
             {
-                throw new ArgumentNullException(nameof(key));
+                throw Error.ArgumentNull_Key(nameof(key));
             }
 
             KeyBlobFormat format = SelectKeyBlobFormat(key.Algorithm);
@@ -31,7 +31,7 @@ public static byte[] Export(
         {
             if (key == null)
             {
-                throw new ArgumentNullException(nameof(key));
+                throw Error.ArgumentNull_Key(nameof(key));
             }
 
             KeyBlobFormat format = SelectKeyBlobFormat(key.Algorithm);
@@ -48,7 +48,7 @@ public static Key Import(
         {
             if (algorithm == null)
             {
-                throw new ArgumentNullException(nameof(algorithm));
+                throw Error.ArgumentNull_Algorithm(nameof(algorithm));
             }
 
             KeyBlobFormat format = SelectKeyBlobFormat(algorithm);
@@ -65,7 +65,7 @@ public static Key Import(
         {
             if (algorithm == null)
             {
-                throw new ArgumentNullException(nameof(algorithm));
+                throw Error.ArgumentNull_Algorithm(nameof(algorithm));
             }
 
             KeyBlobFormat format = SelectKeyBlobFormat(algorithm);
@@ -80,7 +80,7 @@ public static Key Import(
         {
             if (scheme == null)
             {
-                throw new ArgumentNullException(nameof(scheme));
+                throw Error.ArgumentNull_Scheme(nameof(scheme));
             }
 
             Reader reader = new(blob);
@@ -96,7 +96,7 @@ public static Key Import(
         {
             if (scheme == null)
             {
-                throw new ArgumentNullException(nameof(scheme));
+                throw Error.ArgumentNull_Scheme(nameof(scheme));
             }
 
             Reader reader = new(blob);
@@ -114,7 +114,7 @@ internal static byte[] Encrypt(
         {
             if (scheme == null)
             {
-                throw new ArgumentNullException(nameof(scheme));
+                throw Error.ArgumentNull_Scheme(nameof(scheme));
             }
 
             byte[] ciphertext = scheme.Encrypt(password, salt, nonce, plaintext);
@@ -133,7 +133,7 @@ internal static byte[] Encrypt(
         {
             if (scheme == null)
             {
-                throw new ArgumentNullException(nameof(scheme));
+                throw Error.ArgumentNull_Scheme(nameof(scheme));
             }
 
             byte[] ciphertext = scheme.Encrypt(password, salt, nonce, plaintext);