Merge pull request #431 from brandsimon/sbr/improve_errors

Improve error messages of Public{Ecc,Rsa}ParametersBuilder
parallaxsecond · Sep 14, 2023 · 56f7b1d · 56f7b1d
2 parents a449af7 + ff3c06d
commit 56f7b1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tss-esapi/src/structures/tagged/public/ecc.rs b/tss-esapi/src/structures/tagged/public/ecc.rs
@@ -155,12 +155,12 @@ impl PublicEccParametersBuilder {
                     return Err(Error::local_error(WrapperErrorKind::InconsistentParams));
                 }
             } else {
-                error!("Found symmetric parameter, expected it to be Null nor not set at all because 'restricted' and 'is_decrypt_key' are set to false");
+                error!("Symmetric parameter was not set but 'restricted' and 'is_decrypt_key' are set to true");
                 return Err(Error::local_error(WrapperErrorKind::ParamsMissing));
             }
         } else if let Some(symmetric) = self.symmetric {
             if !symmetric.is_null() {
-                error!("Found symmetric parameter, expected it to be Null nor not set at all because 'restricted' and 'is_decrypt_key' are set to false");
+                error!("Found symmetric parameter, expected it to be Null or not set at all because 'restricted' or 'is_decrypt_key' are set to false");
                 return Err(Error::local_error(WrapperErrorKind::InconsistentParams));
             }
         }

diff --git a/tss-esapi/src/structures/tagged/public/rsa.rs b/tss-esapi/src/structures/tagged/public/rsa.rs
@@ -155,12 +155,12 @@ impl PublicRsaParametersBuilder {
                     return Err(Error::local_error(WrapperErrorKind::InconsistentParams));
                 }
             } else {
-                error!("Found symmetric parameter, expected it to be Null nor not set at all because 'restricted' and 'is_decrypt_key' are set to false");
+                error!("Symmetric parameter was not set but 'restricted' and 'is_decrypt_key' are set to true");
                 return Err(Error::local_error(WrapperErrorKind::ParamsMissing));
             }
         } else if let Some(symmetric) = self.symmetric {
             if !symmetric.is_null() {
-                error!("Found symmetric parameter, expected it to be Null nor not set at all because 'restricted' and 'is_decrypt_key' are set to false");
+                error!("Found symmetric parameter, expected it to be Null or not set at all because 'restricted' or 'is_decrypt_key' are set to false");
                 return Err(Error::local_error(WrapperErrorKind::InconsistentParams));
             }
         }