Skip to content

Commit

Permalink
refactor: fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Jun 1, 2023
1 parent 6036902 commit 1e300ac
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
32 changes: 18 additions & 14 deletions src/composed/message/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -872,26 +872,30 @@ mod tests {

#[test]
fn test_rsa_signing_string() {
let (skey, _headers) = SignedSecretKey::from_armor_single(
fs::File::open("./tests/opengpg-interop/testcases/messages/gnupg-v1-001-decrypt.asc")
for _ in 0..100 {
let (skey, _headers) = SignedSecretKey::from_armor_single(
fs::File::open(
"./tests/opengpg-interop/testcases/messages/gnupg-v1-001-decrypt.asc",
)
.unwrap(),
)
.unwrap();
)
.unwrap();

let pkey = skey.public_key();
let pkey = skey.public_key();

let lit_msg = Message::new_literal("hello.txt", "hello world\n");
let signed_msg = lit_msg
.sign(&skey, || "test".into(), HashAlgorithm::SHA2_256)
.unwrap();
let lit_msg = Message::new_literal("hello.txt", "hello world\n");
let signed_msg = lit_msg
.sign(&skey, || "test".into(), HashAlgorithm::SHA2_256)
.unwrap();

let armored = signed_msg.to_armored_bytes(None).unwrap();
fs::write("./message-string-signed-rsa.asc", &armored).unwrap();
let armored = signed_msg.to_armored_bytes(None).unwrap();
fs::write("./message-string-signed-rsa.asc", &armored).unwrap();

signed_msg.verify(&pkey).unwrap();
signed_msg.verify(&pkey).unwrap();

let parsed = Message::from_armor_single(Cursor::new(&armored)).unwrap().0;
parsed.verify(&pkey).unwrap();
let parsed = Message::from_armor_single(Cursor::new(&armored)).unwrap().0;
parsed.verify(&pkey).unwrap();
}
}

#[test]
Expand Down
8 changes: 4 additions & 4 deletions src/composed/signed_key/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@
#[macro_use]
mod key_parser_macros;

pub mod parse;
pub mod public;
pub mod secret;
pub mod shared;
mod parse;
mod public;
mod secret;
mod shared;

pub use self::parse::*;
pub use self::public::*;
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/rsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fn verify_int<D>(key: RsaPublicKey, hashed: &[u8], signature: &RsaSignature) ->
where
D: Digest + AssociatedOid,
{
VerifyingKey::<D>::new_with_prefix(key)
VerifyingKey::<D>::new(key)
.verify_prehash(hashed, signature)
.map_err(Into::into)
}
Expand All @@ -89,7 +89,7 @@ fn sign_int<D>(key: RsaPrivateKey, digest: &[u8]) -> Result<RsaSignature>
where
D: Digest + AssociatedOid,
{
SigningKey::<D>::new_with_prefix(key)
SigningKey::<D>::new(key)
.sign_prehash(digest)
.map_err(Into::into)
}
Expand Down

0 comments on commit 1e300ac

Please sign in to comment.