Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cursive/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ A curses password manager written in Rust.

TUI interface based on [cursive](https://github.com/gyscos/Cursive)

This requires the ncurses libraries to be available on your system.

#### Install
```
cargo install ripasso-cursive
```

Or get it from your package system if it's availible.
Or get it from your package system if it's available.

## Translations

Expand Down
12 changes: 6 additions & 6 deletions src/crypto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,14 @@ impl Crypto for GpgMe {
let mut sig_sum = None;

for (i, s) in result.signatures().enumerate() {
let fpr = s
let fingerprint_hex = s
.fingerprint()
.map_err(|e| InfrastructureError(format!("{e:?}")))?;

let fpr =
<[u8; 20]>::from_hex(fpr).map_err(|e| InfrastructureError(format!("{e:?}")))?;
let fingerprint_bytes = <[u8; 20]>::from_hex(fingerprint_hex)
.map_err(|e| InfrastructureError(format!("{e:?}")))?;

if !valid_signing_keys.contains(&fpr) {
if !valid_signing_keys.contains(&fingerprint_bytes) {
return Err(VerificationError::SignatureFromWrongRecipient);
}
if i == 0 {
Expand Down Expand Up @@ -494,8 +494,8 @@ fn find(
let recipient = recipient.as_ref().ok_or(Error::Generic("No recipient"))?;

match recipient {
KeyHandle::Fingerprint(fpr) => {
match fpr {
KeyHandle::Fingerprint(fingerprint) => {
match fingerprint {
Fingerprint::V6(_v6) => {
return Err(Error::Generic("v6 keys not supported yet"));
}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,7 @@ fn test_verify_git_signature() -> Result<()> {

assert_eq!(
Error::Generic(
"the commit wasn\'t signed by one of the keys specified in the environmental variable PASSWORD_STORE_SIGNING_KEY"
"the commit wasn't signed by one of the keys specified in the environmental variable PASSWORD_STORE_SIGNING_KEY"
),
result.err().unwrap()
);
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ impl DecryptionHelper for &mut KeyLister {
pkesks
.iter()
.map(|p| match p.recipient().clone().unwrap() {
KeyHandle::Fingerprint(fpr) => Ok(fpr.into()),
KeyHandle::Fingerprint(fingerprint) => Ok(fingerprint.into()),
KeyHandle::KeyID(key_id) => Ok(key_id),
})
.collect::<std::result::Result<Vec<KeyID>, anyhow::Error>>()?,
Expand Down
12 changes: 6 additions & 6 deletions src/words.rs
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ const WORDS: &[&str] = &[
"browse",
"browsing",
"bruising",
"brunch",
"branch",
"brunette",
"brunt",
"brush",
Expand Down Expand Up @@ -1198,7 +1198,7 @@ const WORDS: &[&str] = &[
"coming",
"comma",
"commence",
"commend",
"command",
"comment",
"commerce",
"commode",
Expand Down Expand Up @@ -3844,7 +3844,7 @@ const WORDS: &[&str] = &[
"mandate",
"mandatory",
"mandolin",
"manger",
"manager",
"mangle",
"mango",
"mangy",
Expand Down Expand Up @@ -4811,7 +4811,7 @@ const WORDS: &[&str] = &[
"preface",
"prefix",
"preflight",
"preformed",
"performed",
"pregame",
"pregnancy",
"pregnant",
Expand Down Expand Up @@ -5059,7 +5059,7 @@ const WORDS: &[&str] = &[
"racing",
"racism",
"rack",
"racoon",
"raccoon",
"radar",
"radial",
"radiance",
Expand Down Expand Up @@ -7441,7 +7441,7 @@ const WORDS: &[&str] = &[
"urology",
"usable",
"usage",
"useable",
"usable",
"used",
"uselessly",
"user",
Expand Down