Fix bad error on too long resetting code

Nitrokey · Oct 10, 2022 · c885fe7 · c885fe7
1 parent b9f850a
commit c885fe7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/command.rs b/src/command.rs
@@ -577,6 +577,11 @@ fn reset_retry_conter_with_code<const R: usize, T: trussed::Client>(
         Ok(()) => {}
     }
 
+    if new.len() > MAX_PIN_LENGTH {
+        warn!("Attempt to set resetting code too short");
+        return Err(Status::IncorrectDataParameter);
+    }
+
     ctx.state
         .internal
         .change_pin(ctx.backend.client_mut(), new, Password::Pw1)

diff --git a/tests/verify.rs b/tests/verify.rs
@@ -112,14 +112,16 @@ fn verify() {
             tx.reset_retry_counter_pw1(b"new code", None).unwrap();
             assert_checks!(tx, Some(3), Some(3), None);
             tx.verify_pw1_user(b"new code").unwrap();
+            tx.set_resetting_code(&[0; 127]).unwrap();
+            tx.set_resetting_code(&[0; 128]).unwrap_err();
         });
         card.reset();
         card.with_tx(|mut tx| {
             assert!(tx.verify_pw1_user(b"bad code").is_err());
             assert!(tx.verify_pw1_user(b"bad code").is_err());
             assert!(tx.verify_pw1_user(b"bad code").is_err());
             assert_checks!(tx, Some(0), Some(0), Some(3));
-            tx.reset_retry_counter_pw1(b"123456", Some(b"1234567890"))
+            tx.reset_retry_counter_pw1(b"123456", Some(&[0; 127]))
                 .unwrap();
             assert_checks!(tx, Some(3), Some(3), Some(3));
             tx.verify_pw1_user(b"123456").unwrap();