Apply suggestions from code review

Co-authored-by: Wiktor Kwapisiewicz <[email protected]>

Author: jaeparker22

cryptoki/src/mechanism/aead.rs

@@ -63,10 +63,7 @@ impl<'a> GcmParams<'a> {
                 },
                 // Since this field isn't universally used, set it to 0 if it doesn't fit in CK_ULONG.
                 // If the HSM doesn't require the field, it won't mind; and it it does, it would break anyways.
-                ulIvBits: match iv_bit_len.try_into() {
-                    Ok(len) => len,
-                    Err(_e) => 0,
-                },
+                ulIvBits: iv_bit_len.try_into().unwrap_or_default(),
                 pAAD: aad.as_ptr() as *mut _,
                 ulAADLen: match aad
                     .len()

cryptoki/tests/basic.rs

@@ -1279,13 +1279,7 @@ fn gcm_param_graceful_failure() -> TestResult {
     println!("iv");
     let aad = [0; 16];
 
-    let _gcm_params = match GcmParams::new(&mut iv, &aad, 96.into()) {
-        Ok(params) => params,
-        Err(e) => { 
-            println!("{e}");
-            return Err(e.into());
-        },
-    };
+    GcmParams::new(&mut iv, &aad, 96.into())?;
 
     Ok(())
 }
@@ -1317,7 +1311,7 @@ fn aes_gcm_no_aad() -> TestResult {
         Attribute::Encrypt(true),
     ];
     let key_handle = session.create_object(&template)?;
-    let mechanism = Mechanism::AesGcm(GcmParams::new(&mut iv, &aad, 96.into()).unwrap());
+    let mechanism = Mechanism::AesGcm(GcmParams::new(&mut iv, &aad, 96.into())?);
     let cipher_and_tag = session.encrypt(&mechanism, key_handle, &plain)?;
     assert_eq!(expected_cipher_and_tag[..], cipher_and_tag[..]);
     Ok(())
@@ -1348,13 +1342,7 @@ fn aes_gcm_with_aad() -> TestResult {
         Attribute::Encrypt(true),
     ];
     let key_handle = session.create_object(&template)?;
-    let gcm_params = match GcmParams::new(&mut iv, &aad, 96.into()) {
-        Ok(params) => params,
-        Err(e) => { 
-            println!("{e}");
-            return Err(e.into());
-        },
-    };
+    let gcm_params = match GcmParams::new(&mut iv, &aad, 96.into())?;
     let mechanism = Mechanism::AesGcm(gcm_params);
     let cipher_and_tag = session.encrypt(&mechanism, key_handle, &plain)?;
     assert_eq!(expected_cipher_and_tag[..], cipher_and_tag[..]);