Skip to content
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.

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

Adjusting padding in RSA decryption #85

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion openpgp-dsm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1704,8 +1704,24 @@ impl Decryptor for DsmAgent {

match ciphertext {
MpiCiphertext::RSA { c } => {
let data_length = c.value().len();

// RSA Key size is not directly available, so we're estimating it based on the ciphertext size.
let target_length = match data_length {
len if len <= 256 => 256, // likely RSA-2048
len if len <= 384 => 384, // likely RSA-3072
len if len <= 512 => 512, // likely RSA-4096
len if len <= 1024 => 1024, // likely RSA-8192
_ => data_length, // Return original length if no match
};

let mut cipher = c.value().to_vec().into();
if data_length < target_length {
cipher = c.value_padded(target_length).context("Failed to adjust padding.")?.to_vec().into();
}

let decrypt_req = DecryptRequest {
cipher: c.value().to_vec().into(),
cipher: cipher,
alg: Some(Rsa),
iv: None,
key: Some(self.descriptor.clone()),
Expand Down