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

Make low level signing and decryption fn private.

Browse source 
Adjust docs.
This commit is contained in:
Heiko Schaefer 2021-09-01 22:27:37 +02:00
parent f8d998b3a6
commit b6cc237f61
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ impl CardApp {
// --- select --- // --- select ---
/// "Select" the OpenPGP card application /// Select the OpenPGP card application
pub fn select(&mut self) -> Result<Response, OpenpgpCardError> { pub fn select(&mut self) -> Result<Response, OpenpgpCardError> {
let select_openpgp = commands::select_openpgp(); let select_openpgp = commands::select_openpgp();
apdu::send_command(&mut self.card_client, select_openpgp, false)? apdu::send_command(&mut self.card_client, select_openpgp, false)?
@ -100,11 +100,11 @@ impl CardApp {
// --- get data --- // --- get data ---
/// Load "application related data". /// Get the "application related data" from the card.
/// ///
/// This data should probably be cached in a higher layer. Some parts of /// (This data should probably be cached in a higher layer. Some parts of
/// it are needed regularly, and it will not usually change during /// it are needed regularly, and it does not usually change during
/// normal use of a card. /// normal use of a card.)
pub fn get_app_data(&mut self) -> Result<ApplicationRelatedData> { pub fn get_app_data(&mut self) -> Result<ApplicationRelatedData> {
let ad = commands::get_application_data(); let ad = commands::get_application_data();
let resp = apdu::send_command(&mut self.card_client, ad, true)?; let resp = apdu::send_command(&mut self.card_client, ad, true)?;
@ -214,7 +214,7 @@ impl CardApp {
apdu::send_command(&mut self.card_client, cmd, true)?.try_into() apdu::send_command(&mut self.card_client, cmd, true)?.try_into()
} }
/// DO "Algorithm Information" (0xFA) /// DO "Algorithm Information"
pub fn get_algo_info(&mut self) -> Result<Option<AlgoInfo>> { pub fn get_algo_info(&mut self) -> Result<Option<AlgoInfo>> {
let resp = apdu::send_command( let resp = apdu::send_command(
&mut self.card_client, &mut self.card_client,
@ -227,8 +227,7 @@ impl CardApp {
Ok(Some(ai)) Ok(Some(ai))
} }
/// 7.2.5 SELECT DATA /// SELECT DATA "select a DO in the current template"
/// "select a DO in the current template"
/// (e.g. for cardholder certificate) /// (e.g. for cardholder certificate)
pub fn select_data( pub fn select_data(
&mut self, &mut self,
@ -251,7 +250,7 @@ impl CardApp {
/// Reset all state on this OpenPGP card. /// Reset all state on this OpenPGP card.
/// ///
/// Note: the "factory reset" operation is not directly offered by the /// Note: the "factory reset" operation is not directly offered by the
/// card. It is composed of a series of steps: /// card. It is implemented as a series of OpenPGP card commands:
/// - send 4 bad requests to verify pw1 /// - send 4 bad requests to verify pw1
/// - send 4 bad requests to verify pw3 /// - send 4 bad requests to verify pw3
/// - terminate_df /// - terminate_df
@ -379,8 +378,8 @@ impl CardApp {
/// Decrypt the ciphertext in `dm`, on the card. /// Decrypt the ciphertext in `dm`, on the card.
/// ///
/// This is a convenience wrapper around `pso_decipher()` which builds /// (This is a convenience wrapper around the low-level pso_decipher
/// the required `data` field from `dm`. /// operation, it builds the required `data` field from `dm`)
pub fn decrypt( pub fn decrypt(
&mut self, &mut self,
dm: Cryptogram, dm: Cryptogram,
@ -408,9 +407,9 @@ impl CardApp {
} }
} }
/// Run decryption operation on the smartcard /// Run decryption operation on the smartcard (low level operation)
/// (7.2.11 PSO: DECIPHER) /// (7.2.11 PSO: DECIPHER)
pub fn pso_decipher( fn pso_decipher(
&mut self, &mut self,
data: Vec<u8>, data: Vec<u8>,
) -> Result<Vec<u8>, OpenpgpCardError> { ) -> Result<Vec<u8>, OpenpgpCardError> {
@ -426,8 +425,9 @@ impl CardApp {
/// Sign `hash`, on the card. /// Sign `hash`, on the card.
/// ///
/// This is a convenience wrapper around `pso_compute_digital_signature()` /// (This is a convenience wrapper around the low-level
/// which builds the required `data` field from `dm`. /// pso_compute_digital_signature operation. It builds the required
/// `data` field from `hash`)
pub fn signature_for_hash( pub fn signature_for_hash(
&mut self, &mut self,
hash: Hash, hash: Hash,
@ -461,9 +461,9 @@ impl CardApp {
self.pso_compute_digital_signature(data) self.pso_compute_digital_signature(data)
} }
/// Run signing operation on the smartcard /// Run signing operation on the smartcard (low level operation)
/// (7.2.10 PSO: COMPUTE DIGITAL SIGNATURE) /// (7.2.10 PSO: COMPUTE DIGITAL SIGNATURE)
pub fn pso_compute_digital_signature( fn pso_compute_digital_signature(
&mut self, &mut self,
data: Vec<u8>, data: Vec<u8>,
) -> Result<Vec<u8>, OpenpgpCardError> { ) -> Result<Vec<u8>, OpenpgpCardError> {