diff --git a/tests/command_response.rs b/tests/command_response.rs index ceb1afa..f576a37 100644 --- a/tests/command_response.rs +++ b/tests/command_response.rs @@ -526,7 +526,7 @@ impl IoCmd { ); if !output.validate(&rep) { - panic!("Bad output. Expected {output:02x?}"); + panic!("Bad output. Expected {output:02x?}, got {rep:02x?}"); } if status != expected_status { panic!("Bad status. Expected {expected_status:?}, got {status:?}"); @@ -721,20 +721,21 @@ impl IoCmd { fn run_select(card: &mut setup::Piv) { let matcher = OutputMatcher::Bytes(Cow::Borrowed(&hex!( " - 61 66 // Card application property template + 61 69 // Card application property template 4f 06 000010000100 // Application identifier 50 0c 4e6974726f6b657920504956 // Application label = b\"Nitrokey PIV\" // URL = b\"https://github.com/Nitrokey/piv-authenticator\" 5f50 2d 68747470733a2f2f6769746875622e636f6d2f4e6974726f6b65792f7069762d61757468656e74696361746f72 // Cryptographic Algorithm Identifier Template - ac 15 + ac 18 80 01 03 // TDES - ECB 80 01 0c // AES256 - ECB 80 01 11 // P-256 - 80 01 e2 // Ed25519 - 80 01 e3 // X25519 80 01 07 // RSA 2048 + 80 01 05 // RSA 3072 + 80 01 16 // RSA 4096 + 80 01 14 // P384 06 01 00 // Coexistent Tag Allocation Authority Template 79 07 diff --git a/tests/pivy.rs b/tests/pivy.rs index f04192c..4426690 100644 --- a/tests/pivy.rs +++ b/tests/pivy.rs @@ -74,7 +74,7 @@ fn list() { p.expect(format!("device: {CARD}")).unwrap(); p.expect("chuid: ok").unwrap(); p.expect(Regex("guid: [0-9A-Z]*")).unwrap(); - p.expect("algos: 3DES AES256 ECCP256 (null) (null)") + p.expect("algos: 3DES AES256 ECCP256 RSA2048 (null) (null) ECCP384") .unwrap(); p.expect(Eof).unwrap(); assert_eq!(