d7162287c1
* Changes of existing tools:
dbginfo.sh: Add details on CPU-measurement
dbginfo.sh: Add new crypto command
dbginfo.sh: Add overview commands and crypto update
dbginfo.sh: Adding kdump info
dbginfo.sh: Removing outdated email references
dbginfo.sh: Rework network section
dbginfo.sh: Update copyright 2nd year
pvimg: Add '--(enable|disable)-image-encryption' flags to 'pvimg create'
pvimg: Add '--cck ' command line option and make '--comm-key' an alias
pvimg: Add '--hdr-key' command line option to 'pvimg create'
pvimg: Rename '--key' into '--hdr-key' and use '--key' as an alias (for 'pvimg info')
pvsecret: Add support for retrievable secrets
ziorep_config: Add PCHID field to adapter report
ziorep_traffic: Add DEVBUSID column to traffic report
ziorep_utilization: Add --fcp-device parameter to print virtual adapter report
ziorep_utilization: Add PCHID column to physical adapter report
ziorep_utilization: Now prints only physical adapter report by default
ziorep_utilization: Swap Bus-ID and CHPID columns in virtual adapter report
zipl/boot: Increase section size for eckd_mv dumper
zkey: Add support for listing and importing protected virtualization secrets
* Bug Fixes:
chpstat: Fix invalid utilization data on older kernels
opticsmon: Fix runaway loop in on_link_change()
zipl: Update inline assembly for GCC 15
zipl_helper.device-mapper: Add missed step in logical device resolution
- Revendored vendor.tar.gz
- Removed obsolete patches:
* s390-tools-01-zipl_helper.device-mapper-add-missed-step-in-logical.patch
* s390-tools-02-zipl-src-fix-imprecise-check-that-file-is-on-specifi.patch
* s390-tools-General-update-01.patch
* s390-tools-General-update-02.patch
* s390-tools-General-update-03.patch
* s390-tools-General-update-04.patch
* s390-tools-General-update-05.patch
* s390-tools-General-update-06.patch
* s390-tools-General-update-07.patch
* s390-tools-General-update-08.patch
* s390-tools-General-update-09.patch
* s390-tools-General-update-10.patch
* s390-tools-General-update-11.patch
* s390-tools-General-update-12.patch
* s390-tools-Additional-update-01.patch
* s390-tools-Additional-update-02.patch
* s390-tools-pvimg-info-command-01.patch
* s390-tools-pvimg-info-command-02.patch
* s390-tools-pvimg-info-command-03.patch
* s390-tools-Support-unencrypted-SE-images-01.patch
* s390-tools-pvimg-info-command-04.patch
* s390-tools-pvimg-additional-01.patch
* s390-tools-01-zkey-Add-support-for-retrieving-a-list-of-ultravisor-secrets.patch
* s390-tools-02-zkey-Add-the--pvsecrets-list-command.patch
* s390-tools-03-zkey-Add-PVSECRETS-AES-key-type.patch
* s390-tools-04-zkey-Add-the-pvsecrets-import-command.patch
* s390-tools-05-zkey-Reject-key-generation-and-APQN-association-for-PVSECRET-AES-keys.patch
* s390-tools-06-zkey-Reject-re-enciphering-of-PVSECRET-AES-keys.patch
* s390-tools-07-zkey-Support-validation-of-key-of-type-PVSECRET-AES.patch
* s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch
* s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=249
102 lines
4.0 KiB
Diff
102 lines
4.0 KiB
Diff
From 6e48c5ebaa26c6bd2a1bc33ccf36ed8bd6946358 Mon Sep 17 00:00:00 2001
|
|
From: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
Date: Tue, 17 Dec 2024 18:13:31 +0100
|
|
Subject: [PATCH] pvimg: info: Rename '--key' into '--hdr-key' and use '--key'
|
|
as an alias
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Rename '--key' into '--hdr-key' and use '--key' as an (non-visible)
|
|
alias for '--hdr-key' in order to keep the command line backwards
|
|
compatible. The chances of someone using '--key' are very low, as this
|
|
version has not yet been released by any OS distribution.
|
|
|
|
This change makes the command line options for the different subcommands
|
|
more consistent and therefore easier to use.
|
|
|
|
Suggested-by: Reinhard Bündgen <buendgen@de.ibm.com>
|
|
Acked-by: Hendrik Brueckner <brueckner@linux.ibm.com>
|
|
Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
|
|
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
|
---
|
|
rust/pvimg/man/pvimg-info.1 | 2 +-
|
|
rust/pvimg/src/cli.rs | 22 +++++++++++++++++++---
|
|
rust/pvimg/src/cmd/info.rs | 2 +-
|
|
3 files changed, 21 insertions(+), 5 deletions(-)
|
|
|
|
Index: s390-tools-2.36.0/rust/pvimg/man/pvimg-info.1
|
|
===================================================================
|
|
--- s390-tools-2.36.0.orig/rust/pvimg/man/pvimg-info.1
|
|
+++ s390-tools-2.36.0/rust/pvimg/man/pvimg-info.1
|
|
@@ -37,7 +37,7 @@ Possible values:
|
|
.RE
|
|
.RE
|
|
.PP
|
|
-\-\-key <FILE>
|
|
+\-\-hdr\-key <FILE>
|
|
.RS 4
|
|
Use the key in FILE to decrypt the Secure Execution header.
|
|
.RE
|
|
Index: s390-tools-2.36.0/rust/pvimg/src/cli.rs
|
|
===================================================================
|
|
--- s390-tools-2.36.0.orig/rust/pvimg/src/cli.rs
|
|
+++ s390-tools-2.36.0/rust/pvimg/src/cli.rs
|
|
@@ -192,8 +192,8 @@ pub struct InfoArgs {
|
|
pub format: OutputFormat,
|
|
|
|
/// Use the key in FILE to decrypt the Secure Execution header.
|
|
- #[arg(long, value_name = "FILE", value_hint = ValueHint::FilePath,)]
|
|
- pub key: Option<PathBuf>,
|
|
+ #[arg(long, value_name = "FILE", value_hint = ValueHint::FilePath, alias = "key")]
|
|
+ pub hdr_key: Option<PathBuf>,
|
|
}
|
|
|
|
#[derive(Args, Debug)]
|
|
@@ -710,6 +710,22 @@ mod test {
|
|
CliOption::new("image", ["/dev/null"]),
|
|
],
|
|
)),
|
|
+ flat_map_collect(insert(
|
|
+ args.clone(),
|
|
+ vec![
|
|
+ CliOption::new("hdr-key", ["--hdr-key", "/dev/null"]),
|
|
+ CliOption::new("format", ["--format=json"]),
|
|
+ CliOption::new("image", ["/dev/null"]),
|
|
+ ],
|
|
+ )),
|
|
+ flat_map_collect(insert(
|
|
+ args.clone(),
|
|
+ vec![
|
|
+ CliOption::new("hdr-key", ["--key", "/dev/null"]),
|
|
+ CliOption::new("format", ["--format=json"]),
|
|
+ CliOption::new("image", ["/dev/null"]),
|
|
+ ],
|
|
+ )),
|
|
// separation between keyword and positional args works
|
|
flat_map_collect(insert(
|
|
args.clone(),
|
|
@@ -750,7 +766,7 @@ mod test {
|
|
|
|
// Test for invalid combinations
|
|
// Input is missing
|
|
- let mut pvimg_invalid_args = vec![vec!["pvimg", "test"]];
|
|
+ let mut pvimg_invalid_args = vec![vec!["pvimg", "info"]];
|
|
|
|
for create_args in &valid_test_args {
|
|
pvimg_valid_args.push(
|
|
Index: s390-tools-2.36.0/rust/pvimg/src/cmd/info.rs
|
|
===================================================================
|
|
--- s390-tools-2.36.0.orig/rust/pvimg/src/cmd/info.rs
|
|
+++ s390-tools-2.36.0/rust/pvimg/src/cmd/info.rs
|
|
@@ -27,7 +27,7 @@ pub fn info(opt: &InfoArgs) -> Result<Ow
|
|
|
|
SeHdr::seek_sehdr(&mut input, None)?;
|
|
let hdr = SeHdr::try_from_io(input)?;
|
|
- if let Some(key_path) = &opt.key {
|
|
+ if let Some(key_path) = &opt.hdr_key {
|
|
let key =
|
|
SymKey::try_from_data(hdr.key_type(), read_file(key_path, "Reading key")?.into())?;
|
|
serde_json::to_writer_pretty(&mut output, &hdr.decrypt(&key)?)?;
|