janis/duralumin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed building on windows

Browse source
This commit is contained in:
noonebtw 2022-01-07 09:30:56 +01:00
parent 7e9ad7c793
commit 27789f94d2
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -24,7 +24,7 @@ required-features = ["ed25519", "clap", "rpassword", "base64"]
[dependencies]
rand = "0.8.4"
clap = {version = "3.0.0-beta.5", optional = true}
clap = {version = "3.0.0-beta.5", optional = true, features = ["derive"]}
base64 = {version = "0.13.0", optional = true}
bytes = {version = "1.1.0", optional = true}
osshkeys = {git = "https://github.com/noonebtw/rust-osshkeys.git", branch = "master", optional = true}

13
src/bin/duralumin-keygen.rs
View file

@ -1,5 +1,6 @@
use std::{fs::Permissions, io::Write};
use std::io::Write;
#[macro_use]
use clap::Parser;
use libduralumin::ed25519::{generate_ed25519_keypair, randomart};
use osshkeys::{error::OsshResult, PublicParts};
@ -83,16 +84,15 @@ fn main() -> OsshResult<()> {
println!("Using passphrase to encrypt key..");
}
let fingerprint =
keypair.fingerprint(osshkeys::keys::FingerprintHash::SHA256)?;
let fingerprint = keypair.fingerprint(osshkeys::keys::FingerprintHash::SHA256)?;
println!(
"Your key fingerprint is: Sha256:{}",
base64::encode(&fingerprint)
);
let randomart = randomart::RandomArt::from_digest(&fingerprint)
.render("ED25519 256", "SHA256")?;
let randomart =
randomart::RandomArt::from_digest(&fingerprint).render("ED25519 256", "SHA256")?;
println!("RandomArt:\n{}", randomart);
@ -108,6 +108,9 @@ fn main() -> OsshResult<()> {
let public_key = keypair.serialize_publickey()?;
std::fs::write(&public_path, public_key)?;
#[cfg(target_family = "unix")]
use std::fs::Permissions;
#[cfg(target_family = "unix")]
use std::os::unix::fs::PermissionsExt;
#[cfg(target_family = "unix")]

9
src/bin/duralumin.rs
View file

@ -1,3 +1,4 @@
#[macro_use]
use clap::Parser;
use libduralumin::passphrase_gen::{PassPhraseGenerator, Words};
@ -69,12 +70,8 @@ fn main() {
.with_length(opts.words_per_passphrase());
let words = match opts.backend() {
Some(Backend::UseAPassPhrase) => {
Words::from_str(include_str!("../../useapassphrase.txt"))
}
Some(Backend::EnglishWords) => {
Words::from_str(include_str!("../../words_alpha.txt"))
}
Some(Backend::UseAPassPhrase) => Words::from_str(include_str!("../../useapassphrase.txt")),
Some(Backend::EnglishWords) => Words::from_str(include_str!("../../words_alpha.txt")),
None => {
panic!("invalid backend.")
}