diff --git a/apps/desktop/desktop_native/win_webauthn/src/plugin/crypto.rs b/apps/desktop/desktop_native/win_webauthn/src/plugin/crypto.rs index 0060448c72f..727e8435ac5 100644 --- a/apps/desktop/desktop_native/win_webauthn/src/plugin/crypto.rs +++ b/apps/desktop/desktop_native/win_webauthn/src/plugin/crypto.rs @@ -366,7 +366,10 @@ impl AsRef<[u8]> for VerifyingKey { mod tests { use std::ptr::NonNull; - use windows::Win32::Security::Cryptography::{BCRYPT_RSAKEY_BLOB, BCRYPT_RSAPUBLIC_MAGIC}; + use windows::Win32::Security::Cryptography::{ + BCRYPT_ECCKEY_BLOB, BCRYPT_ECDSA_PUBLIC_P384_MAGIC, BCRYPT_RSAKEY_BLOB, + BCRYPT_RSAPUBLIC_MAGIC, + }; use crate::plugin::crypto::{verify_signature, VerifyingKey}; @@ -496,4 +499,77 @@ mod tests { }; verify_signature(&verify_key, digest, signature).expect("a signature to verify properly"); } + + #[test] + fn test_p384_signature_verifies_properly() { + // SHA-256 hash of "abc" + let digest = &[ + 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, + 0x22, 0x23, 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff, 0x61, + 0xf2, 0x00, 0x15, 0xad, + ]; + /* + Test private key used to create expected signature, generated by OpenSSL + + -----BEGIN PRIVATE KEY----- + MIICDAIBADCCAWQGByqGSM49AgEwggFXAgEBMDwGByqGSM49AQECMQD///////// + /////////////////////////////////v////8AAAAAAAAAAP////8wewQw//// + //////////////////////////////////////7/////AAAAAAAAAAD////8BDCz + MS+n4j7n5JiOBWvj+C0ZGB2cbv6BQRIDFAiPUBOHWsZWOY2KLtGdKoXI7dPsKu8D + FQCjNZJqoxmieh0AiWpnc6SCes2scwRhBKqHyiK+iwU3jrHHHvMgrXRuHTtii6eb + mFn3QeCCVCo4VQLyXb9VKWw6VF44cnYKtzYX3kqWJixvXZ6Yv5KS3Cn49B29KJoU + fOnaMRO18LjACmCxzh1+gZ16Qx18kOoOXwIxAP////////////////////////// + /////8djTYH0Ny3fWBoNskiwp3rs7BlqzMUpcwIBAQSBnjCBmwIBAQQwhL/0kQDy + 6VNH5op7R6mvyUth/0KXz7+/3E4bAW1bDngC/TTDdUL1mTL1i4iN0j+AoWQDYgAE + ub2c2ielLaE8+cCrwjw1LV8AGTLLz9yxLjSiJgPOfwHYCXP+wKVU1hsurlCYnQdn + 7Kkj5uCTLDspCY+PIM2QQ6t246no9d/FeujLzv/GHP9K+QsC/qjbQ+WGJ4m5dGTo + -----END PRIVATE KEY----- + + Signature generated with: + openssl pkeyutl -sign -inkey p384.key.pem -in hash.bin -out sig_der.bin + Converted from DER to IEEE P1363 (r || s) format. + */ + // P-384 public key X coordinate (48 bytes, big-endian) + let x: &[u8] = &[ + 0xb9, 0xbd, 0x9c, 0xda, 0x27, 0xa5, 0x2d, 0xa1, 0x3c, 0xf9, 0xc0, 0xab, 0xc2, 0x3c, + 0x35, 0x2d, 0x5f, 0x00, 0x19, 0x32, 0xcb, 0xcf, 0xdc, 0xb1, 0x2e, 0x34, 0xa2, 0x26, + 0x03, 0xce, 0x7f, 0x01, 0xd8, 0x09, 0x73, 0xfe, 0xc0, 0xa5, 0x54, 0xd6, 0x1b, 0x2e, + 0xae, 0x50, 0x98, 0x9d, 0x07, 0x67, + ]; + // P-384 public key Y coordinate (48 bytes, big-endian) + let y: &[u8] = &[ + 0xec, 0xa9, 0x23, 0xe6, 0xe0, 0x93, 0x2c, 0x3b, 0x29, 0x09, 0x8f, 0x8f, 0x20, 0xcd, + 0x90, 0x43, 0xab, 0x76, 0xe3, 0xa9, 0xe8, 0xf5, 0xdf, 0xc5, 0x7a, 0xe8, 0xcb, 0xce, + 0xff, 0xc6, 0x1c, 0xff, 0x4a, 0xf9, 0x0b, 0x02, 0xfe, 0xa8, 0xdb, 0x43, 0xe5, 0x86, + 0x27, 0x89, 0xb9, 0x74, 0x64, 0xe8, + ]; + let key_header = BCRYPT_ECCKEY_BLOB { + dwMagic: BCRYPT_ECDSA_PUBLIC_P384_MAGIC, + cbKey: 48, // P-384: 384 bits / 8 = 48 bytes per coordinate + }; + let mut public_key_bytes: Vec = unsafe { + std::slice::from_raw_parts( + std::ptr::from_ref(&key_header).cast::(), + std::mem::size_of::(), + ) + } + .to_vec(); + public_key_bytes.extend_from_slice(x); + public_key_bytes.extend_from_slice(y); + let verify_key = VerifyingKey { + cbPublicKey: public_key_bytes.len() as u32, + pbPublicKey: NonNull::new(public_key_bytes.as_mut_ptr().cast()).unwrap(), + }; + // ECDSA signature in IEEE P1363 format (r || s), each 48 bytes, big-endian + let signature: &[u8] = &[ + 0x2b, 0xc0, 0x76, 0x7f, 0x79, 0x82, 0xec, 0x5f, 0xd2, 0xe9, 0xd1, 0x68, 0x37, 0x5f, + 0x6c, 0x2b, 0x14, 0xda, 0x27, 0x81, 0xed, 0x91, 0x88, 0x9e, 0x1c, 0x0a, 0x5e, 0xfd, + 0x8d, 0xfb, 0xca, 0x3b, 0x31, 0x0e, 0x06, 0x48, 0x42, 0x75, 0xcd, 0x29, 0xd9, 0x23, + 0x76, 0xf9, 0xcf, 0x6f, 0x37, 0xa1, 0xb7, 0x73, 0x1c, 0xc4, 0xba, 0xa8, 0x16, 0x8f, + 0xd7, 0xef, 0x9b, 0x67, 0x6d, 0xab, 0x61, 0x62, 0x02, 0x3c, 0x64, 0xb5, 0x72, 0xe0, + 0xcf, 0x86, 0xa7, 0x04, 0x78, 0x74, 0xb8, 0x68, 0x92, 0x46, 0x61, 0x14, 0xfd, 0x2b, + 0xa4, 0x28, 0x2a, 0xb9, 0x6d, 0x05, 0xf4, 0x61, 0xf2, 0x76, 0x32, 0x8c, + ]; + verify_signature(&verify_key, digest, signature).expect("a signature to verify properly"); + } }