turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wrap RSA-hashes in digestinfo, for internal_authenticate() in the new fn authenticate_for_hash().

Browse source
This commit is contained in:
Heiko Schaefer 2021-11-07 20:15:24 +01:00
parent 1220b39498
commit 7bb2fcb497
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
openpgp-card/src/card_app.rs
View file

@ -461,22 +461,8 @@ impl CardApp {
// --- sign --- // --- sign ---
/// Sign `hash`, on the card. fn digestinfo(hash: Hash) -> Vec<u8> {
/// match hash {
/// This is a wrapper around the low-level
/// pso_compute_digital_signature operation.
/// It builds the required `data` field from `hash`.
///
/// For RSA, this means a "DigestInfo" data structure is generated.
/// (see 7.2.10.2 DigestInfo for RSA).
///
/// With ECC the hash data is processed as is, using
/// pso_compute_digital_signature.
pub fn signature_for_hash(
&mut self,
hash: Hash,
) -> Result<Vec<u8>, Error> {
let data = match hash {
Hash::SHA256(_) | Hash::SHA384(_) | Hash::SHA512(_) => { Hash::SHA256(_) | Hash::SHA384(_) | Hash::SHA512(_) => {
let tlv = Tlv::new( let tlv = Tlv::new(
[0x30], [0x30],
@ -500,9 +486,25 @@ impl CardApp {
} }
Hash::EdDSA(d) => d.to_vec(), Hash::EdDSA(d) => d.to_vec(),
Hash::ECDSA(d) => d.to_vec(), Hash::ECDSA(d) => d.to_vec(),
}; }
}
self.pso_compute_digital_signature(data) /// Sign `hash`, on the card.
///
/// This is a wrapper around the low-level
/// pso_compute_digital_signature operation.
/// It builds the required `data` field from `hash`.
///
/// For RSA, this means a "DigestInfo" data structure is generated.
/// (see 7.2.10.2 DigestInfo for RSA).
///
/// With ECC the hash data is processed as is, using
/// pso_compute_digital_signature.
pub fn signature_for_hash(
&mut self,
hash: Hash,
) -> Result<Vec<u8>, Error> {
self.pso_compute_digital_signature(Self::digestinfo(hash))
} }
/// Run signing operation on the smartcard (low level operation) /// Run signing operation on the smartcard (low level operation)
@ -520,9 +522,26 @@ impl CardApp {
// --- internal authenticate --- // --- internal authenticate ---
/// Auth-sign `hash`, on the card.
///
/// This is a wrapper around the low-level
/// internal_authenticate operation.
/// It builds the required `data` field from `hash`.
///
/// For RSA, this means a "DigestInfo" data structure is generated.
/// (see 7.2.10.2 DigestInfo for RSA).
///
/// With ECC the hash data is processed as is.
pub fn authenticate_for_hash(
&mut self,
hash: Hash,
) -> Result<Vec<u8>, Error> {
self.internal_authenticate(Self::digestinfo(hash))
}
/// Run signing operation on the smartcard (low level operation) /// Run signing operation on the smartcard (low level operation)
/// (7.2.13 INTERNAL AUTHENTICATE) /// (7.2.13 INTERNAL AUTHENTICATE)
pub fn internal_authenticate( fn internal_authenticate(
&mut self, &mut self,
data: Vec<u8>, data: Vec<u8>,
) -> Result<Vec<u8>, Error> { ) -> Result<Vec<u8>, Error> {