fix(key): remove any newlines from passphrase

To match the behavior of the C code and because there may be newlines under some conditions. Signed-off-by: Thomas Mühlbacher <[email protected]>
koverstreet · Jun 18, 2024 · e4271d7 · e4271d7
1 parent 87ab1fd
commit e4271d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/key.rs b/src/key.rs
@@ -158,7 +158,7 @@ impl Passphrase {
             line
         };
 
-        Ok(Self(CString::new(passphrase.as_str())?))
+        Ok(Self(CString::new(passphrase.trim_end_matches('\n'))?))
     }
 
     pub fn new_from_file(sb: &bch_sb_handle, passphrase_file: impl AsRef<Path>) -> Result<Self> {
@@ -172,6 +172,6 @@ impl Passphrase {
 
         let passphrase = Zeroizing::new(fs::read_to_string(passphrase_file)?);
 
-        Ok(Self(CString::new(passphrase.as_str())?))
+        Ok(Self(CString::new(passphrase.trim_end_matches('\n'))?))
     }
 }