Skip to content

feat: add create_certificate_with_sid #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add create_certificate_with_sid #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions examples/sign_binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ fn sign_file<S: SessionLike>(
let pe = PE::parse(&contents).expect("Failed to parse the PE binary");

let certificate;
let issuer;
{
let parent = parents.last().unwrap();
// Create a unique certificate for this particular instance,
Expand All @@ -364,18 +363,12 @@ fn sign_file<S: SessionLike>(
certificate = builder
.build::<ecdsa::der::Signature<p256::NistP256>>()
.expect("Failed to assemble the certificate");
issuer = cms::signed_data::SignerIdentifier::IssuerAndSerialNumber(
cms::cert::IssuerAndSerialNumber {
issuer: parent.tbs_certificate.issuer.clone(),
serial_number: parent.tbs_certificate.serial_number.clone(),
},
);
}
parents.push(certificate);
parents.push(certificate.clone());
let pe_certificate = create_certificate::<Sha256, _, ecdsa::der::Signature<_>>(
&pe,
parents,
issuer,
certificate,
parent_signer,
)
.expect("Failed to produce an PE attribute certificate");
Expand Down
30 changes: 29 additions & 1 deletion src/sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::{authenticode::Authenticode, certificate::DigestInfo};

/// Produces a certificate for the given PE
/// with the given signer identifier and signer.
pub fn create_certificate<'pe, D: Digest, S, Signature>(
pub fn create_certificate_with_sid<'pe, D: Digest, S, Signature>(
pe: &PE<'pe>,
certificates: Vec<Certificate>,
sid: SignerIdentifier,
Expand Down Expand Up @@ -72,3 +72,31 @@ where
goblin::pe::certificate_table::AttributeCertificateType::PkcsSignedData,
))
}
/// Produces a certificate for the given PE
/// with the given signer.
/// The signer identity is derived from the leaf certificate.
pub fn create_certificate<'pe, D: Digest, S, Signature>(
pe: &PE<'pe>,
certificates: Vec<Certificate>,
leaf_certificate: Certificate,
signer: &S,
) -> Result<AttributeCertificate<'pe>, SignatureError>
where
D: const_oid::AssociatedOid,
S: Keypair + DynSignatureAlgorithmIdentifier,
S::VerifyingKey: EncodePublicKey,
S: Signer<Signature>,
Signature: SignatureBitStringEncoding,
{
create_certificate_with_sid::<D, S, Signature>(
pe,
certificates,
cms::signed_data::SignerIdentifier::IssuerAndSerialNumber(
cms::cert::IssuerAndSerialNumber {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note to self: This could be worth a impl From<&Cert> for cms::cert::IssuerAndSerialNumber

issuer: leaf_certificate.tbs_certificate.issuer.clone(),
serial_number: leaf_certificate.tbs_certificate.serial_number.clone(),
},
),
signer,
)
}
8 changes: 4 additions & 4 deletions tests/test_snakeoil_sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cms::cert::IssuerAndSerialNumber;
use digest::Digest;
use goblin::pe::{writer::PEWriter, PE};
use goblin_signing::authenticode::Authenticode;
use goblin_signing::sign::create_certificate;
use goblin_signing::sign::create_certificate_with_sid;
use goblin_signing::verify::{certificates_from_pe, verify_pe_signatures_no_trust};
use p256::ecdsa::SigningKey;
use sha2::Sha256;
Expand Down Expand Up @@ -56,7 +56,7 @@ fn test_create_attribute_certificate() {
let signing_key = SigningKey::random(&mut OsRng);
let sid = build_issuer("CN=test", 1).expect("Failed to build a trivial issuer");
let certificate = build_certificate("CN=test", 1, &signing_key);
let _ = create_certificate::<Sha256, _, ecdsa::der::Signature<_>>(
let _ = create_certificate_with_sid::<Sha256, _, ecdsa::der::Signature<_>>(
&pe,
vec![certificate],
sid,
Expand Down Expand Up @@ -89,7 +89,7 @@ fn test_attaching_attribute_certificate_to_pe() {
"Pending PE digest: {:?}",
pending_pe.authenticode_dyndigest(Box::new(sha2::Sha256::new()))
);
let attr_cert = create_certificate::<Sha256, _, ecdsa::der::Signature<_>>(
let attr_cert = create_certificate_with_sid::<Sha256, _, ecdsa::der::Signature<_>>(
&pending_pe,
vec![certificate],
sid,
Expand Down Expand Up @@ -143,7 +143,7 @@ fn test_multisig_pe() {
.write_into()
.expect("Failed to write an unsigned PE");
let pending_pe = PE::parse(&pending_pe[..]).expect("Failed to parse the unsigned PE");
let attr_cert = create_certificate::<Sha256, _, ecdsa::der::Signature<_>>(
let attr_cert = create_certificate_with_sid::<Sha256, _, ecdsa::der::Signature<_>>(
&pending_pe,
vec![certificate],
sid,
Expand Down