Skip to content

Commit a3f5248

Browse files
baloobaloo
committed
rustcrypto: initial commit
Signed-off-by: Arthur Gautier <[email protected]>
1 parent 6b81342 commit a3f5248

File tree

9 files changed

+862
-3
lines changed

9 files changed

+862
-3
lines changed

‎Cargo.lock

+332-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[workspace]
2-
members = ["cryptoki", "cryptoki-sys"]
2+
members = ["cryptoki", "cryptoki-sys", "cryptoki-rustcrypto"]

‎cryptoki-rustcrypto/Cargo.toml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
name = "cryptoki-rustcrypto"
3+
version = "0.1.0"
4+
edition = "2018"
5+
authors = ["Contributors to the Parsec project"]
6+
description = "Compatibility layer from PKCS #11 to the RustCrypto ecosystem"
7+
readme = "README.md"
8+
keywords = ["pkcs11", "cryptoki", "hsm"]
9+
categories = ["cryptography", "hardware-support"]
10+
license = "Apache-2.0"
11+
12+
[dependencies]
13+
cryptoki = { path = "../cryptoki", version = "0.6.1" }
14+
der = "0.7.8"
15+
rsa = "0.9"
16+
signature = { version = "2.2.0", features = ["digest"] }
17+
sha1 = { version = "0.10", features = ["oid"] }
18+
sha2 = { version = "0.10", features = ["oid"] }
19+
spki = "0.7.2"
20+
thiserror = "1.0"
21+
22+
[dev-dependencies]
23+
serial_test = "0.5.1"
24+
testresult = "0.2.0"

‎cryptoki-rustcrypto/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod rsa;

‎cryptoki-rustcrypto/src/rsa/mod.rs

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
use cryptoki::mechanism::{
2+
rsa::{PkcsMgfType, PkcsPssParams},
3+
Mechanism, MechanismType,
4+
};
5+
use cryptoki::object::AttributeType;
6+
use der::oid::AssociatedOid;
7+
use signature::digest::Digest;
8+
use std::convert::TryInto;
9+
use thiserror::Error;
10+
11+
pub mod pkcs1v15;
12+
13+
pub mod pss;
14+
15+
#[derive(Debug, Error)]
16+
pub enum Error {
17+
#[error("Cryptoki error: {0}")]
18+
Cryptoki(#[from] cryptoki::error::Error),
19+
20+
#[error("Private key missing attribute: {0}")]
21+
MissingAttribute(AttributeType),
22+
23+
#[error("RSA error: {0}")]
24+
Rsa(#[from] rsa::Error),
25+
}
26+
27+
pub trait DigestSigning: Digest + AssociatedOid {
28+
fn pkcs_mechanism() -> Mechanism<'static>;
29+
30+
fn pss_mechanism() -> Mechanism<'static>;
31+
}
32+
33+
macro_rules! impl_digest_signing {
34+
($d:ty, $pkcs_mech:ident, $pss_mech:ident, $mt:ident, $mgf:ident) => {
35+
impl DigestSigning for $d {
36+
fn pkcs_mechanism() -> Mechanism<'static> {
37+
Mechanism::$pkcs_mech
38+
}
39+
40+
fn pss_mechanism() -> Mechanism<'static> {
41+
Mechanism::$pss_mech(PkcsPssParams {
42+
hash_alg: MechanismType::$mt,
43+
mgf: PkcsMgfType::$mgf,
44+
// Safety:
45+
// the output_size of an hash function will not go over 2^32,
46+
// this unwrap is safe.
47+
s_len: Self::output_size().try_into().unwrap(),
48+
})
49+
}
50+
}
51+
};
52+
}
53+
54+
impl_digest_signing!(sha1::Sha1, Sha1RsaPkcs, Sha1RsaPkcsPss, SHA1, MGF1_SHA1);
55+
impl_digest_signing!(
56+
sha2::Sha256,
57+
Sha256RsaPkcs,
58+
Sha256RsaPkcsPss,
59+
SHA256,
60+
MGF1_SHA256
61+
);
62+
impl_digest_signing!(
63+
sha2::Sha384,
64+
Sha384RsaPkcs,
65+
Sha384RsaPkcsPss,
66+
SHA384,
67+
MGF1_SHA384
68+
);
69+
impl_digest_signing!(
70+
sha2::Sha512,
71+
Sha512RsaPkcs,
72+
Sha512RsaPkcsPss,
73+
SHA512,
74+
MGF1_SHA512
75+
);

‎cryptoki-rustcrypto/src/rsa/pkcs1v15.rs

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
use cryptoki::{
2+
object::{Attribute, AttributeType, KeyType, ObjectClass, ObjectHandle},
3+
session::Session,
4+
};
5+
use der::AnyRef;
6+
use rsa::{
7+
pkcs1,
8+
pkcs1v15::{Signature, VerifyingKey},
9+
BigUint, RsaPublicKey,
10+
};
11+
use spki::{AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, SignatureAlgorithmIdentifier};
12+
use std::convert::TryFrom;
13+
14+
use super::{DigestSigning, Error};
15+
16+
pub struct Signer<D: DigestSigning> {
17+
session: Session,
18+
_public_key: ObjectHandle,
19+
private_key: ObjectHandle,
20+
verifying_key: VerifyingKey<D>,
21+
}
22+
23+
impl<D: DigestSigning> Signer<D> {
24+
pub fn new(session: Session, label: &[u8]) -> Result<Self, Error> {
25+
// First we'll lookup a private key with that label.
26+
let template = vec![
27+
Attribute::Token(true),
28+
Attribute::Private(true),
29+
Attribute::Label(label.to_vec()),
30+
Attribute::Class(ObjectClass::PRIVATE_KEY),
31+
Attribute::KeyType(KeyType::RSA),
32+
Attribute::Sign(true),
33+
];
34+
35+
let private_key = session.find_objects(&template)?.remove(0);
36+
let attribute_pk = session.get_attributes(
37+
private_key,
38+
&[AttributeType::Modulus, AttributeType::PublicExponent],
39+
)?;
40+
41+
// Second we'll lookup a public key with the same label/modulus/public exponent
42+
let mut template = vec![
43+
Attribute::Private(false),
44+
Attribute::Label(label.to_vec()),
45+
Attribute::Class(ObjectClass::PUBLIC_KEY),
46+
Attribute::KeyType(KeyType::RSA),
47+
];
48+
let mut modulus = None;
49+
let mut public_exponent = None;
50+
for attribute in attribute_pk {
51+
match attribute {
52+
Attribute::Modulus(m) if modulus.is_none() => {
53+
modulus = Some(m.clone());
54+
template.push(Attribute::Modulus(m));
55+
}
56+
Attribute::PublicExponent(e) if public_exponent.is_none() => {
57+
public_exponent = Some(e.clone());
58+
template.push(Attribute::PublicExponent(e));
59+
}
60+
_ => {}
61+
}
62+
}
63+
64+
let modulus = modulus
65+
.ok_or(Error::MissingAttribute(AttributeType::Modulus))
66+
.map(|v| BigUint::from_bytes_be(v.as_slice()))?;
67+
let public_exponent = public_exponent
68+
.ok_or(Error::MissingAttribute(AttributeType::PublicExponent))
69+
.map(|v| BigUint::from_bytes_be(v.as_slice()))?;
70+
71+
let public_key = session.find_objects(&template)?.remove(0);
72+
73+
let verifying_key = VerifyingKey::new(RsaPublicKey::new(modulus, public_exponent)?);
74+
75+
Ok(Self {
76+
session,
77+
private_key,
78+
_public_key: public_key,
79+
verifying_key,
80+
})
81+
}
82+
83+
pub fn into_session(self) -> Session {
84+
self.session
85+
}
86+
}
87+
88+
impl<D: DigestSigning> AssociatedAlgorithmIdentifier for Signer<D> {
89+
type Params = AnyRef<'static>;
90+
const ALGORITHM_IDENTIFIER: AlgorithmIdentifierRef<'static> = pkcs1::ALGORITHM_ID;
91+
}
92+
93+
impl<D: DigestSigning> signature::Keypair for Signer<D> {
94+
type VerifyingKey = VerifyingKey<D>;
95+
96+
fn verifying_key(&self) -> Self::VerifyingKey {
97+
self.verifying_key.clone()
98+
}
99+
}
100+
101+
impl<D: DigestSigning> signature::Signer<Signature> for Signer<D> {
102+
fn try_sign(&self, msg: &[u8]) -> Result<Signature, signature::Error> {
103+
let bytes = self
104+
.session
105+
.sign(&D::pkcs_mechanism(), self.private_key, msg)
106+
.map_err(Error::Cryptoki)
107+
.map_err(Box::new)
108+
.map_err(signature::Error::from_source)?;
109+
110+
let signature = Signature::try_from(bytes.as_slice())?;
111+
112+
Ok(signature)
113+
}
114+
}
115+
116+
impl<D: DigestSigning> SignatureAlgorithmIdentifier for Signer<D> {
117+
type Params = AnyRef<'static>;
118+
119+
const SIGNATURE_ALGORITHM_IDENTIFIER: AlgorithmIdentifierRef<'static> =
120+
AlgorithmIdentifierRef {
121+
oid: D::OID,
122+
parameters: Some(AnyRef::NULL),
123+
};
124+
}

‎cryptoki-rustcrypto/src/rsa/pss.rs

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
use cryptoki::{
2+
object::{Attribute, AttributeType, KeyType, ObjectClass, ObjectHandle},
3+
session::Session,
4+
};
5+
use der::{asn1::ObjectIdentifier, oid::AssociatedOid, Any, AnyRef};
6+
use rsa::{
7+
pkcs1::{self, RsaPssParams},
8+
pkcs8::{self},
9+
pss::{Signature, VerifyingKey},
10+
BigUint, RsaPublicKey,
11+
};
12+
use signature::digest::Digest;
13+
use spki::{
14+
AlgorithmIdentifierOwned, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier,
15+
DynSignatureAlgorithmIdentifier,
16+
};
17+
use std::convert::TryFrom;
18+
19+
use super::{DigestSigning, Error};
20+
21+
pub struct Signer<D: DigestSigning> {
22+
session: Session,
23+
_public_key: ObjectHandle,
24+
private_key: ObjectHandle,
25+
verifying_key: VerifyingKey<D>,
26+
salt_len: usize,
27+
}
28+
29+
impl<D: DigestSigning> Signer<D> {
30+
pub fn new(session: Session, label: &[u8]) -> Result<Self, Error> {
31+
// First we'll lookup a private key with that label.
32+
let template = vec![
33+
Attribute::Token(true),
34+
Attribute::Private(true),
35+
Attribute::Label(label.to_vec()),
36+
Attribute::Class(ObjectClass::PRIVATE_KEY),
37+
Attribute::KeyType(KeyType::RSA),
38+
Attribute::Sign(true),
39+
];
40+
41+
let private_key = session.find_objects(&template)?.remove(0);
42+
let attribute_pk = session.get_attributes(
43+
private_key,
44+
&[AttributeType::Modulus, AttributeType::PublicExponent],
45+
)?;
46+
47+
// Second we'll lookup a public key with the same label/modulus/public exponent
48+
let mut template = vec![
49+
Attribute::Private(false),
50+
Attribute::Label(label.to_vec()),
51+
Attribute::Class(ObjectClass::PUBLIC_KEY),
52+
Attribute::KeyType(KeyType::RSA),
53+
];
54+
let mut modulus = None;
55+
let mut public_exponent = None;
56+
for attribute in attribute_pk {
57+
match attribute {
58+
Attribute::Modulus(m) if modulus.is_none() => {
59+
modulus = Some(m.clone());
60+
template.push(Attribute::Modulus(m));
61+
}
62+
Attribute::PublicExponent(e) if public_exponent.is_none() => {
63+
public_exponent = Some(e.clone());
64+
template.push(Attribute::PublicExponent(e));
65+
}
66+
_ => {}
67+
}
68+
}
69+
70+
let modulus = modulus
71+
.ok_or(Error::MissingAttribute(AttributeType::Modulus))
72+
.map(|v| BigUint::from_bytes_be(v.as_slice()))?;
73+
let public_exponent = public_exponent
74+
.ok_or(Error::MissingAttribute(AttributeType::PublicExponent))
75+
.map(|v| BigUint::from_bytes_be(v.as_slice()))?;
76+
77+
let public_key = session.find_objects(&template)?.remove(0);
78+
79+
let verifying_key = VerifyingKey::new(RsaPublicKey::new(modulus, public_exponent)?);
80+
let salt_len = <D as Digest>::output_size();
81+
82+
Ok(Self {
83+
session,
84+
private_key,
85+
_public_key: public_key,
86+
verifying_key,
87+
salt_len,
88+
})
89+
}
90+
91+
pub fn into_session(self) -> Session {
92+
self.session
93+
}
94+
}
95+
96+
impl<D: DigestSigning> AssociatedAlgorithmIdentifier for Signer<D> {
97+
type Params = AnyRef<'static>;
98+
const ALGORITHM_IDENTIFIER: AlgorithmIdentifierRef<'static> = pkcs1::ALGORITHM_ID;
99+
}
100+
101+
impl<D: DigestSigning> signature::Keypair for Signer<D> {
102+
type VerifyingKey = VerifyingKey<D>;
103+
104+
fn verifying_key(&self) -> Self::VerifyingKey {
105+
self.verifying_key.clone()
106+
}
107+
}
108+
109+
impl<D: DigestSigning> signature::Signer<Signature> for Signer<D> {
110+
fn try_sign(&self, msg: &[u8]) -> Result<Signature, signature::Error> {
111+
let bytes = self
112+
.session
113+
.sign(&D::pss_mechanism(), self.private_key, msg)
114+
.map_err(Error::Cryptoki)
115+
.map_err(Box::new)
116+
.map_err(signature::Error::from_source)?;
117+
118+
let signature = Signature::try_from(bytes.as_slice())?;
119+
120+
Ok(signature)
121+
}
122+
}
123+
124+
impl<D: DigestSigning> DynSignatureAlgorithmIdentifier for Signer<D> {
125+
fn signature_algorithm_identifier(&self) -> pkcs8::spki::Result<AlgorithmIdentifierOwned> {
126+
get_pss_signature_algo_id::<D>(self.salt_len as u8)
127+
}
128+
}
129+
130+
fn get_pss_signature_algo_id<D>(salt_len: u8) -> pkcs8::spki::Result<AlgorithmIdentifierOwned>
131+
where
132+
D: Digest + AssociatedOid,
133+
{
134+
const ID_RSASSA_PSS: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.840.113549.1.1.10");
135+
136+
let pss_params = RsaPssParams::new::<D>(salt_len);
137+
138+
Ok(AlgorithmIdentifierOwned {
139+
oid: ID_RSASSA_PSS,
140+
parameters: Some(Any::encode_from(&pss_params)?),
141+
})
142+
}

0 commit comments

Comments
 (0)