Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
96f35520a0 | |||
490560e0c6 | |||
52f53d8280 |
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "proxmox-backup"
|
name = "proxmox-backup"
|
||||||
version = "1.0.4"
|
version = "1.0.5"
|
||||||
authors = [
|
authors = [
|
||||||
"Dietmar Maurer <dietmar@proxmox.com>",
|
"Dietmar Maurer <dietmar@proxmox.com>",
|
||||||
"Dominik Csapak <d.csapak@proxmox.com>",
|
"Dominik Csapak <d.csapak@proxmox.com>",
|
||||||
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
rust-proxmox-backup (1.0.5-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* client: restore: print meta information exclusively to standard error
|
||||||
|
|
||||||
|
-- Proxmox Support Team <support@proxmox.com> Wed, 25 Nov 2020 15:29:58 +0100
|
||||||
|
|
||||||
rust-proxmox-backup (1.0.4-1) unstable; urgency=medium
|
rust-proxmox-backup (1.0.4-1) unstable; urgency=medium
|
||||||
|
|
||||||
* fingerprint: add bytes() accessor
|
* fingerprint: add bytes() accessor
|
||||||
|
8
debian/control
vendored
8
debian/control
vendored
@ -35,10 +35,10 @@ Build-Depends: debhelper (>= 11),
|
|||||||
librust-percent-encoding-2+default-dev (>= 2.1-~~),
|
librust-percent-encoding-2+default-dev (>= 2.1-~~),
|
||||||
librust-pin-project-0.4+default-dev,
|
librust-pin-project-0.4+default-dev,
|
||||||
librust-pin-utils-0.1+default-dev,
|
librust-pin-utils-0.1+default-dev,
|
||||||
librust-proxmox-0.7+api-macro-dev (>= 0.7.1-~~),
|
librust-proxmox-0.7+api-macro-dev (>= 0.7.2-~~),
|
||||||
librust-proxmox-0.7+default-dev (>= 0.7.1-~~),
|
librust-proxmox-0.7+default-dev (>= 0.7.2-~~),
|
||||||
librust-proxmox-0.7+sortable-macro-dev (>= 0.7.1-~~),
|
librust-proxmox-0.7+sortable-macro-dev (>= 0.7.2-~~),
|
||||||
librust-proxmox-0.7+websocket-dev (>= 0.7.1-~~),
|
librust-proxmox-0.7+websocket-dev (>= 0.7.2-~~),
|
||||||
librust-proxmox-fuse-0.1+default-dev,
|
librust-proxmox-fuse-0.1+default-dev,
|
||||||
librust-pxar-0.6+default-dev (>= 0.6.1-~~),
|
librust-pxar-0.6+default-dev (>= 0.6.1-~~),
|
||||||
librust-pxar-0.6+futures-io-dev (>= 0.6.1-~~),
|
librust-pxar-0.6+futures-io-dev (>= 0.6.1-~~),
|
||||||
|
@ -644,7 +644,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
|
|||||||
(None, None) => None,
|
(None, None) => None,
|
||||||
(Some(_), Some(_)) => bail!("--keyfile and --keyfd are mutually exclusive"),
|
(Some(_), Some(_)) => bail!("--keyfile and --keyfd are mutually exclusive"),
|
||||||
(Some(keyfile), None) => {
|
(Some(keyfile), None) => {
|
||||||
println!("Using encryption key file: {}", keyfile);
|
eprintln!("Using encryption key file: {}", keyfile);
|
||||||
Some(file_get_contents(keyfile)?)
|
Some(file_get_contents(keyfile)?)
|
||||||
},
|
},
|
||||||
(None, Some(fd)) => {
|
(None, Some(fd)) => {
|
||||||
@ -654,7 +654,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
|
|||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
format_err!("error reading encryption key from fd {}: {}", fd, err)
|
format_err!("error reading encryption key from fd {}: {}", fd, err)
|
||||||
})?;
|
})?;
|
||||||
println!("Using encryption key from file descriptor");
|
eprintln!("Using encryption key from file descriptor");
|
||||||
Some(data)
|
Some(data)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -663,7 +663,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
|
|||||||
// no parameters:
|
// no parameters:
|
||||||
(None, None) => match key::read_optional_default_encryption_key()? {
|
(None, None) => match key::read_optional_default_encryption_key()? {
|
||||||
Some(key) => {
|
Some(key) => {
|
||||||
println!("Encrypting with default encryption key!");
|
eprintln!("Encrypting with default encryption key!");
|
||||||
(Some(key), CryptMode::Encrypt)
|
(Some(key), CryptMode::Encrypt)
|
||||||
},
|
},
|
||||||
None => (None, CryptMode::None),
|
None => (None, CryptMode::None),
|
||||||
@ -676,7 +676,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
|
|||||||
(None, Some(crypt_mode)) => match key::read_optional_default_encryption_key()? {
|
(None, Some(crypt_mode)) => match key::read_optional_default_encryption_key()? {
|
||||||
None => bail!("--crypt-mode without --keyfile and no default key file available"),
|
None => bail!("--crypt-mode without --keyfile and no default key file available"),
|
||||||
Some(key) => {
|
Some(key) => {
|
||||||
println!("Encrypting with default encryption key!");
|
eprintln!("Encrypting with default encryption key!");
|
||||||
(Some(key), crypt_mode)
|
(Some(key), crypt_mode)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -1257,7 +1257,7 @@ async fn restore(param: Value) -> Result<Value, Error> {
|
|||||||
None => None,
|
None => None,
|
||||||
Some(key) => {
|
Some(key) => {
|
||||||
let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?;
|
let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?;
|
||||||
println!("Encryption key fingerprint: '{}'", fingerprint);
|
eprintln!("Encryption key fingerprint: '{}'", fingerprint);
|
||||||
Some(Arc::new(CryptConfig::new(key)?))
|
Some(Arc::new(CryptConfig::new(key)?))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user