Cleanup and bump version

Cargo.toml

@@ -2,7 +2,7 @@
 name = "rustgenpass"
 authors = ["Olle Wreede <[email protected]>"]
 description = "Generate a hashed password similar to SuperGenPass."
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [dependencies]
@@ -12,7 +12,7 @@ lazy_static = "1.4"
 md-5 = "0.10"
 regex = "1.6"
 rpassword = "7.0.0"
-sha2 = "0.10.6"
+sha2 = "0.10"
 
 [[bin]]
 name = "rgp"

README.md

@@ -12,22 +12,23 @@ Usage
 -----
 
 ```
-rustgenpass 0.1.0
+rustgenpass 0.2.0
 Generate a hashed password similar to SuperGenPass.
 
 USAGE:
     rgp [OPTIONS] --domain <DOMAIN>
 
 OPTIONS:
-    -d, --domain <DOMAIN>        Domain / URL
+    -d, --domain <DOMAIN>        Domain / URL to generate password for
     -h, --help                   Print help information
+    -H, --hash <HASH>            Hashing method to use [default: md5] [possible values: md5, sha512]
     -k, --keep-subdomains        Don't remove subdomains from domain
-    -l, --length <LENGTH>        Length of password, min: 4, max: 24 [default: 10]
+    -l, --length <LENGTH>        Length of generated password, min: 4, max: 24 [default: 10]
     -p, --password <PASSWORD>    Master password, if not given, reads from stdin
     -P, --passthrough            Passthrough domain unmodified to hash function
     -r, --rounds <ROUNDS>        Number of hash rounds [default: 10]
     -s, --secret <SECRET>        Secret added to the master password
-    -V, --version                Print version information
+    -V, --version                Print version informationrustgenpass 0.2.0
 ```
 
 License

src/lib.rs

@@ -131,21 +131,21 @@ fn validate_password<S: AsRef<str>>(password: S) -> bool {
         && RE_CONTAINS_UPPERCASE_LETTER.is_match(password.as_ref())
 }
 
-fn b64_md5<S: AsRef<str>>(hash: S) -> String {
+fn base64_md5<S: AsRef<str>>(hash: S) -> String {
     let mut hasher = Md5::new();
     hasher.update(hash.as_ref());
     let digest = hasher.finalize();
-    base64encode(&digest)
+    base64_encode(&digest)
 }
 
-fn b64_sha512<S: AsRef<str>>(hash: S) -> String {
+fn base64_sha512<S: AsRef<str>>(hash: S) -> String {
     let mut hasher = Sha512::new();
     hasher.update(hash.as_ref());
     let digest = hasher.finalize();
-    base64encode(&digest)
+    base64_encode(&digest)
 }
 
-fn base64encode(digest: &[u8]) -> String {
+fn base64_encode(digest: &[u8]) -> String {
     let b64_md5 = base64::encode(digest);
     b64_md5
         .chars()
@@ -215,8 +215,8 @@ pub fn generate_with_config<S: AsRef<str>>(
     let mut i = 0;
     while i < hash_rounds || !validate_password(&hash[..length]) {
         hash = match hash_algorithm {
-            HashAlgorithm::MD5 => b64_md5(hash),
-            HashAlgorithm::SHA512 => b64_sha512(hash),
+            HashAlgorithm::MD5 => base64_md5(hash),
+            HashAlgorithm::SHA512 => base64_sha512(hash),
         };
         i += 1;
     }

src/main.rs

@@ -2,10 +2,6 @@ use clap::Parser;
 use rustgenpass::{generate_with_config, get_hostname, Cli};
 
 fn main() -> Result<(), String> {
-    /* TODO:
-     * Support sha512 hashing
-     * Builder interface for library
-     */
     let cli = Cli::parse();
     let password = cli.password.unwrap_or_else(|| {
         rpassword::prompt_password("Enter master password: ").expect("You must enter a password.")