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

Rename decrypt() to decipher(), to correspond with naming in spec.

Browse source 
Add a note to investigate PKCS#1 formatting of the command input.
This commit is contained in:
Heiko Schaefer 2021-09-03 13:45:19 +02:00
parent 17ee12566f
commit 7a78271211
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openpgp-card-sequoia/src/decryptor.rs
View file

@ -93,7 +93,7 @@ impl<'a> crypto::Decryptor for CardDecryptor<'a> {
match (ciphertext, self.public.mpis()) { match (ciphertext, self.public.mpis()) {
(mpi::Ciphertext::RSA { c: ct }, mpi::PublicKey::RSA { .. }) => { (mpi::Ciphertext::RSA { c: ct }, mpi::PublicKey::RSA { .. }) => {
let dm = Cryptogram::RSA(ct.value()); let dm = Cryptogram::RSA(ct.value());
let dec = self.ca.decrypt(dm)?; let dec = self.ca.decipher(dm)?;
let sk = openpgp::crypto::SessionKey::from(&dec[..]); let sk = openpgp::crypto::SessionKey::from(&dec[..]);
Ok(sk) Ok(sk)
@ -111,7 +111,7 @@ impl<'a> crypto::Decryptor for CardDecryptor<'a> {
}; };
// Decryption operation on the card // Decryption operation on the card
let mut dec = self.ca.decrypt(dm)?; let mut dec = self.ca.decipher(dm)?;
// Specifically handle return value format like Gnuk's // Specifically handle return value format like Gnuk's
// (Gnuk returns a leading '0x04' byte and // (Gnuk returns a leading '0x04' byte and

4
openpgp-card-sequoia/src/lib.rs
View file

@ -779,8 +779,8 @@ impl DerefMut for CardUser {
impl CardUser { impl CardUser {
/// Decrypt the ciphertext in `dm`, on the card. /// Decrypt the ciphertext in `dm`, on the card.
pub fn decrypt(&mut self, dm: Cryptogram) -> Result<Vec<u8>, Error> { pub fn decipher(&mut self, dm: Cryptogram) -> Result<Vec<u8>, Error> {
self.card_app.decrypt(dm) self.card_app.decipher(dm)
} }
} }

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

@ -374,10 +374,13 @@ impl CardApp {
/// ///
/// (This is a wrapper around the low-level pso_decipher /// (This is a wrapper around the low-level pso_decipher
/// operation, it builds the required `data` field from `dm`) /// operation, it builds the required `data` field from `dm`)
pub fn decrypt(&mut self, dm: Cryptogram) -> Result<Vec<u8>, Error> { pub fn decipher(&mut self, dm: Cryptogram) -> Result<Vec<u8>, Error> {
match dm { match dm {
Cryptogram::RSA(message) => { Cryptogram::RSA(message) => {
let mut data = vec![0x0]; let mut data = vec![0x0];
// FIXME: The spec says we should "format according to PKCS#1"
data.extend_from_slice(message); data.extend_from_slice(message);
// Call the card to decrypt `data` // Call the card to decrypt `data`