chore(deps) Update Tauri CLI (#2745)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
This commit is contained in:
renovate[bot] 2021-10-13 10:02:14 -03:00 committed by GitHub
parent c39797cb89
commit c446908dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 24 deletions

View File

@ -964,9 +964,9 @@ dependencies = [
[[package]]
name = "minisign"
version = "0.6.3"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7701e737ba365ae6a551155687d3697b759512c27ec6d0f56e283826fb20f2c2"
checksum = "43935b78ea0886357ab9259bd227879a54b12a83de261c3270aad584500cba2f"
dependencies = [
"getrandom 0.2.3",
"rpassword",
@ -1203,9 +1203,9 @@ checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
[[package]]
name = "pbkdf2"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
dependencies = [
"crypto-mac",
]
@ -1668,9 +1668,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scrypt"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879588d8f90906e73302547e20fffefdd240eb3e0e744e142321f5d49dea0518"
checksum = "9f2cc535b6997b0c755bf9344e71ca0e1be070d07ff792f1fcd31e7b90e07d5f"
dependencies = [
"hmac",
"pbkdf2",

View File

@ -34,7 +34,7 @@ toml = "0.5"
valico = "3.6"
handlebars = "4.1"
include_dir = "0.6"
minisign = "0.6"
minisign = "0.7"
base64 = "0.13.0"
ureq = "2.2"
os_info = "3.0"

View File

@ -106,7 +106,6 @@ pub fn sign_file<P>(
private_key: String,
password: String,
bin_path: P,
prehashed: bool,
) -> crate::Result<(PathBuf, String)>
where
P: AsRef<Path>,
@ -127,13 +126,12 @@ where
bin_path.as_ref().display()
);
let (data_reader, should_be_prehashed) = open_data_file(bin_path)?;
let data_reader = open_data_file(bin_path)?;
let signature_box = sign(
None,
&sk,
data_reader,
prehashed | should_be_prehashed,
Some(trusted_comment.as_str()),
Some("signature from tauri secret key"),
)?;
@ -166,10 +164,11 @@ where
private_key_string = read_key_from_file(pk_dir)?;
}
// sign our file
return sign_file(private_key_string, password_string, path_to_sign, false);
sign_file(private_key_string, password_string, path_to_sign)
} else {
// reject if we don't have the private key
Err(anyhow::anyhow!("A public key has been found, but no private key. Make sure to set `TAURI_PRIVATE_KEY` environment variable."))
}
// reject if we don't have the private key
Err(anyhow::anyhow!("A public key has been found, but no private key. Make sure to set `TAURI_PRIVATE_KEY` environment variable."))
}
fn unix_timestamp() -> u64 {
@ -180,7 +179,7 @@ fn unix_timestamp() -> u64 {
since_the_epoch.as_secs()
}
fn open_data_file<P>(data_path: P) -> crate::Result<(BufReader<File>, bool)>
fn open_data_file<P>(data_path: P) -> crate::Result<BufReader<File>>
where
P: AsRef<Path>,
{
@ -189,9 +188,5 @@ where
.read(true)
.open(data_path)
.map_err(|e| minisign::PError::new(minisign::ErrorKind::Io, e))?;
let should_be_hashed = match file.metadata() {
Ok(metadata) => metadata.len() > (1u64 << 30),
Err(_) => true,
};
Ok((BufReader::new(file), should_be_hashed))
Ok(BufReader::new(file))
}

View File

@ -64,7 +64,6 @@ impl Signer {
self.private_key.unwrap(),
self.password.unwrap(),
self.file.unwrap(),
false,
)
.with_context(|| "failed to sign file")?;

View File

@ -19,11 +19,11 @@
"rollup-plugin-livereload": "2.0.5",
"rollup-plugin-svelte": "7.1.0",
"rollup-plugin-terser": "7.0.2",
"svelte": "3.43.1",
"svelte-check": "2.2.6",
"svelte": "3.43.2",
"svelte-check": "2.2.7",
"svelte-preprocess": "4.9.8",
"tslib": "2.3.1",
"typescript": "4.4.3"
"typescript": "4.4.4"
},
"dependencies": {
"sirv-cli": "1.0.14",

View File

@ -16,7 +16,7 @@
"@rollup/plugin-typescript": "8.2.5",
"rollup": "2.58.0",
"rollup-plugin-terser": "7.0.2",
"typescript": "4.4.3"
"typescript": "4.4.4"
},
"dependencies": {
"@tauri-apps/api": "1.0.0-beta.8",