cleanup

Author: dignifiedquire

.github/workflows/ci.yml

@@ -39,6 +39,8 @@ jobs:
           - stable
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
@@ -52,6 +54,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@nightly
       - run: cargo update -Z minimal-versions
@@ -62,6 +66,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:

tests/wycheproof.rs

@@ -9,7 +9,7 @@ use pkcs1::DecodeRsaPublicKey;
 use rsa::{
     pkcs1v15, pss,
     signature::{Error as SignatureError, Verifier},
-    Error, Pss, RsaPublicKey,
+    RsaPublicKey,
 };
 use serde::Deserialize;
 use sha1::Sha1;
@@ -28,9 +28,6 @@ struct TestGroup {
     #[serde(rename(deserialize = "type"))]
     typ: String,
 
-    #[serde(default, rename(deserialize = "publicKey"))]
-    public_key: PublicKey,
-
     #[serde(default, rename(deserialize = "publicKeyAsn"), with = "hex::serde")]
     public_key_asn: Vec<u8>,
 
@@ -53,42 +50,13 @@ struct Test {
     id: usize,
     #[allow(unused)] // for Debug
     comment: String,
-    flags: Vec<String>,
-    #[serde(default, with = "hex::serde")]
-    key: Vec<u8>,
     #[serde(default, with = "hex::serde")]
     msg: Vec<u8>,
     #[serde(default, with = "hex::serde")]
-    tag: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
     sig: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    private: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    public: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    shared: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    ct: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    aad: Vec<u8>,
-    #[serde(default, with = "hex::serde")]
-    iv: Vec<u8>,
     result: ExpectedResult,
 }
 
-impl Test {
-    fn has_flag(&self, s: &str) -> bool {
-        self.flags.contains(&s.to_string())
-    }
-}
-
-#[derive(Deserialize, Debug, Default)]
-struct PublicKey {
-    #[serde(default, with = "hex::serde")]
-    uncompressed: Vec<u8>,
-}
-
 #[derive(Copy, Clone, Deserialize, Debug, PartialEq)]
 #[serde(rename_all = "lowercase")]
 enum ExpectedResult {