fix signing

bin/app/src/lib.rs

@@ -48,20 +48,23 @@ pub fn cli() -> Command {
             .action(ArgAction::Count)
             .short('v'),
     );
-    global = global.arg(
-        clap::Arg::new("version")
-            .global(false)
-            .help("Print version")
-            .action(ArgAction::SetTrue)
-            .long("version"),
-    );
     global = global.arg(
         clap::Arg::new("trace")
             .global(true)
             .help("Enable trace logging")
             .action(ArgAction::SetTrue)
             .long("trace"),
     );
+    #[cfg(debug_assertions)]
+    {
+        global = global.arg(
+            clap::Arg::new("in-test")
+                .global(true)
+                .help("we are in a test")
+                .action(ArgAction::SetTrue)
+                .long("in-test"),
+        );
+    }
     global
 }
 
@@ -73,13 +76,10 @@ pub fn cli() -> Command {
 /// # Panics
 /// If the number passed to `--threads` is not a valid number
 pub fn execute(matches: &ArgMatches) -> Result<(), AppError> {
-    if matches.get_flag("version") {
-        println!("HEMTT {}", env!("CARGO_PKG_VERSION"));
-        return Ok(());
+    if cfg!(not(debug_assertions)) || !matches.get_flag("in-test") {
+        logging::init(matches.get_count("verbosity"), matches.get_flag("trace"));
     }
 
-    logging::init(matches.get_count("verbosity"), matches.get_flag("trace"));
-
     trace!("version: {}", env!("CARGO_PKG_VERSION"));
     trace!("platform: {}", std::env::consts::OS);
 

bin/app/src/modules/sign.rs

@@ -32,7 +32,7 @@ impl Module for Sign {
         let authority = get_authority(ctx, None)?;
         let addons_key = BIPrivateKey::generate(1024, &authority)?;
         create_dir_all(ctx.out_folder().join("keys"))?;
-        addons_key.write(&mut File::create(
+        addons_key.to_public_key().write(&mut File::create(
             ctx.out_folder()
                 .join("keys")
                 .join(format!("{authority}.bikey")),
@@ -57,13 +57,12 @@ impl Module for Sign {
                         if ctx.config().hemtt().build().optional_mod_folders() {
                             let authority = get_authority(ctx, Some(&pbo_name))?;
                             let key = BIPrivateKey::generate(1024, &authority)?;
-                            let pubkey = key.to_public_key();
                             let mod_root = ctx
                                 .out_folder()
                                 .join("optionals")
                                 .join(format!("@{pbo_name}"));
                             create_dir_all(mod_root.join("keys"))?;
-                            pubkey.write(&mut File::create(
+                            key.to_public_key().write(&mut File::create(
                                 mod_root.join("keys").join(format!("{authority}.bikey")),
                             )?)?;
                             (mod_root.join("addons").join(pbo_name), key, authority)

bin/app/tests/build.rs

@@ -3,8 +3,8 @@ use hemtt::cli;
 #[test]
 pub fn build() {
     std::env::set_current_dir("tests/alpha").unwrap();
-    hemtt::execute(&cli().get_matches_from(vec!["hemtt", "build"])).unwrap();
+    hemtt::execute(&cli().get_matches_from(vec!["hemtt", "build", "--in-test"])).unwrap();
 
     std::env::set_current_dir("../bravo").unwrap();
-    hemtt::execute(&cli().get_matches_from(vec!["hemtt", "release"])).unwrap();
+    hemtt::execute(&cli().get_matches_from(vec!["hemtt", "release", "--in-test"])).unwrap();
 }

libs/preprocessor/src/lib.rs

@@ -94,6 +94,11 @@ where
                     if next.symbol() == &Symbol::Slash {
                         whitespace::skip_comment(tokenstream);
                     }
+                } else {
+                    tokenstream.move_cursor_back().unwrap();
+                    if context.ifstates().reading() {
+                        output.push(tokenstream.next().unwrap());
+                    }
                 }
             }
             _ => {
@@ -705,6 +710,9 @@ where
                     if next.symbol() == &Symbol::Slash {
                         whitespace::skip_comment(tokenstream);
                     }
+                } else {
+                    tokenstream.move_cursor_back().unwrap();
+                    output.push(tokenstream.next().unwrap());
                 }
             }
             _ => output.push(tokenstream.next().unwrap()),

libs/signing/src/private.rs

@@ -9,7 +9,7 @@ use sha1::{Digest, Sha1};
 use crate::{error::Error, public::BIPublicKey, signature::BISign};
 
 #[allow(clippy::module_name_repetitions)]
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 /// A private key for signing PBOs
 pub struct BIPrivateKey {
     authority: String,
@@ -36,9 +36,6 @@ impl BIPrivateKey {
         let mut rng = rand::thread_rng();
         let mut rsa = RsaPrivateKey::new(&mut rng, length as usize)?;
         rsa.precompute()?;
-        // let Some(precomputed) = rsa.precomputed() else {
-        //     return Err(Error::Rsa(rsa::errors::Error::Internal));
-        // };
         let primes = rsa.primes();
         let Some(qinv) = rsa.qinv().unwrap().to_biguint() else {
             return Err(Error::Rsa(rsa::errors::Error::Internal));
@@ -180,7 +177,7 @@ impl BIPrivateKey {
     ///
     /// # Panics
     /// If the qinv sign is not `NoSign`.
-    pub fn write<O: Write>(&self, output: &mut O) -> Result<(), Error> {
+    pub fn write_danger<O: Write>(&self, output: &mut O) -> Result<(), Error> {
         output.write_cstring(&self.authority)?;
         output.write_u32::<LittleEndian>(self.length / 16 * 9 + 20)?;
         output.write_all(b"\x07\x02\x00\x00\x00\x24\x00\x00")?;

libs/signing/tests/bootstrap.rs

@@ -1,4 +1,4 @@
-use std::fs::File;
+use std::{fs::File, io::Write};
 
 use hemtt_pbo::ReadablePbo;
 use hemtt_signing::BIPrivateKey;
@@ -15,7 +15,7 @@ fn bootstrap() {
             BIPrivateKey::read(&mut File::open(file.path().join("test.biprivatekey")).unwrap())
                 .unwrap();
         let mut buffer = Vec::new();
-        private.write(&mut buffer).unwrap();
+        private.write_danger(&mut buffer).unwrap();
         assert_eq!(
             buffer,
             std::fs::read(file.path().join("test.biprivatekey")).unwrap()