james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix generate_self_signed_ec_cert integration test (#275)

Browse Source 
Unfortunately these tests can't be run in CI as they require a YubiKey
to test against.

The YubiKey generates an ASN.1 DER-encoded ECDSA signature, but the test
was using a fixed-width signature.

The test now passes live against a YubiKey.
This commit is contained in:
Tony Arcieri (iqlusion)
2021-07-12 09:05:40 -07:00
committed by GitHub
parent 1765e11bc0
commit 1018127843
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration.rs
+2 -6
View File
@@ -8,11 +8,7 @@ use lazy_static::lazy_static;
use log::trace; use log::trace;
use rsa::{hash::Hash::SHA2_256, PaddingScheme, PublicKey}; use rsa::{hash::Hash::SHA2_256, PaddingScheme, PublicKey};
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use std::{ use std::{convert::TryInto, env, sync::Mutex};
convert::{TryFrom, TryInto},
env,
sync::Mutex,
};
use x509::RelativeDistinguishedName; use x509::RelativeDistinguishedName;
use yubikey::{ use yubikey::{
certificate::{Certificate, PublicKeyInfo}, certificate::{Certificate, PublicKeyInfo},
@@ -242,7 +238,7 @@ fn generate_self_signed_ec_cert() {
let sig_algo_len = data[7 + tbs_cert_len + 1] as usize; let sig_algo_len = data[7 + tbs_cert_len + 1] as usize;
let sig_start = 7 + tbs_cert_len + 2 + sig_algo_len + 3; let sig_start = 7 + tbs_cert_len + 2 + sig_algo_len + 3;
let msg = &data[4..7 + tbs_cert_len]; let msg = &data[4..7 + tbs_cert_len];
let sig = p256::ecdsa::Signature::try_from(&data[sig_start..]).unwrap(); let sig = p256::ecdsa::Signature::from_der(&data[sig_start..]).unwrap();
let vk = p256::ecdsa::VerifyingKey::from_sec1_bytes(pubkey.as_bytes()).unwrap(); let vk = p256::ecdsa::VerifyingKey::from_sec1_bytes(pubkey.as_bytes()).unwrap();
use p256::ecdsa::signature::Verifier; use p256::ecdsa::signature::Verifier;