diff --git a/s390utils-2.29.0-rhel.patch b/s390utils-2.29.0-rhel.patch index d403dad..22f4d8f 100644 --- a/s390utils-2.29.0-rhel.patch +++ b/s390utils-2.29.0-rhel.patch @@ -1,7 +1,7 @@ From a32824922cb273703bacd44e6a29cbc33ae48cf5 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Fri, 21 Jul 2023 14:06:18 +0200 -Subject: [PATCH 01/21] zkey: Support EP11 AES keys with prepended header to +Subject: [PATCH 01/22] zkey: Support EP11 AES keys with prepended header to retain EP11 session (RHEL-11440) The pkey kernel module supports two key blob formats for EP11 AES keys. @@ -33,7 +33,7 @@ Signed-off-by: Steffen Eiden 8 files changed, 295 insertions(+), 51 deletions(-) diff --git a/zkey/ep11.c b/zkey/ep11.c -index 8359929..df8b57d 100644 +index 83599297..df8b57df 100644 --- a/zkey/ep11.c +++ b/zkey/ep11.c @@ -365,8 +365,9 @@ int select_ep11_apqn_by_mkvp(struct ep11_lib *ep11, u8 *mkvp, @@ -145,7 +145,7 @@ index 8359929..df8b57d 100644 if (rc != 0) return rc; diff --git a/zkey/keystore.c b/zkey/keystore.c -index 4efa2e4..c0a7037 100644 +index 4efa2e45..c0a7037b 100644 --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -3398,7 +3398,9 @@ static int _keystore_perform_reencipher(struct keystore *keystore, @@ -160,7 +160,7 @@ index 4efa2e4..c0a7037 100644 "secure AES key"); } diff --git a/zkey/kmip/zkey-kmip.c b/zkey/kmip/zkey-kmip.c -index a00c5dd..e7b7c73 100644 +index a00c5dd5..e7b7c739 100644 --- a/zkey/kmip/zkey-kmip.c +++ b/zkey/kmip/zkey-kmip.c @@ -5278,9 +5278,11 @@ static int _ep11_unwrap_key_rsa(struct plugin_handle *ph, @@ -266,7 +266,7 @@ index a00c5dd..e7b7c73 100644 return 0; } diff --git a/zkey/kms.c b/zkey/kms.c -index 9892a9e..2e33b22 100644 +index 9892a9e5..2e33b222 100644 --- a/zkey/kms.c +++ b/zkey/kms.c @@ -2175,7 +2175,7 @@ int generate_kms_key(struct kms_info *kms_info, const char *name, @@ -307,7 +307,7 @@ index 9892a9e..2e33b22 100644 if (key_size == 0 || key_blob_size > key_size) { pr_verbose(verbose, "Key '%s' has an unknown or unsupported " diff --git a/zkey/pkey.c b/zkey/pkey.c -index e013e06..2582088 100644 +index e013e06a..25820887 100644 --- a/zkey/pkey.c +++ b/zkey/pkey.c @@ -858,7 +858,7 @@ static enum pkey_key_type key_type_to_pkey_type(const char *key_type) @@ -569,7 +569,7 @@ index e013e06..2582088 100644 if (lib->ep11->lib_ep11 == NULL) { rc = load_ep11_library(lib->ep11, verbose); diff --git a/zkey/pkey.h b/zkey/pkey.h -index 5a5bc3c..3b57c5f 100644 +index 5a5bc3c5..3b57c5f0 100644 --- a/zkey/pkey.h +++ b/zkey/pkey.h @@ -39,6 +39,8 @@ struct tokenheader { @@ -664,7 +664,7 @@ index 5a5bc3c..3b57c5f 100644 int get_key_bit_size(const u8 *key, size_t key_size, size_t *bitsize); const char *get_key_type(const u8 *key, size_t key_size); diff --git a/zkey/zkey-cryptsetup.c b/zkey/zkey-cryptsetup.c -index fae78c7..8b55f7d 100644 +index fae78c7f..8b55f7d1 100644 --- a/zkey/zkey-cryptsetup.c +++ b/zkey/zkey-cryptsetup.c @@ -1673,7 +1673,10 @@ static int reencipher_prepare(int token) @@ -704,7 +704,7 @@ index fae78c7..8b55f7d 100644 "secure AES volume key"); rc = -EINVAL; diff --git a/zkey/zkey.c b/zkey/zkey.c -index 3000290..843e554 100644 +index 3000290f..843e5544 100644 --- a/zkey/zkey.c +++ b/zkey/zkey.c @@ -1968,7 +1968,9 @@ static int command_reencipher_file(void) @@ -730,13 +730,13 @@ index 3000290..843e554 100644 "secure AES key"); } -- -2.51.1 +2.53.0 From df0819ca69dbef1f99321f51cd9c4d33c6374992 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Mon, 7 Aug 2023 16:56:54 +0200 -Subject: [PATCH 02/21] rust/Makefile: Fix use of Cargoflags for 'make clean' +Subject: [PATCH 02/22] rust/Makefile: Fix use of Cargoflags for 'make clean' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -750,7 +750,7 @@ Signed-off-by: Jan Höppner 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/Makefile b/rust/Makefile -index cf2fda7..420bafd 100644 +index cf2fda70..420bafd0 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -68,7 +68,7 @@ clean: @@ -763,13 +763,13 @@ index cf2fda7..420bafd 100644 rust-test: .check-cargo .no-cross-compile -- -2.51.1 +2.53.0 From b6ce8c7fc10c225c0b1d59af32edd323f5817ab7 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Mon, 7 Aug 2023 16:56:55 +0200 -Subject: [PATCH 03/21] rust/README.md: Fix some typos +Subject: [PATCH 03/22] rust/README.md: Fix some typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -783,7 +783,7 @@ Signed-off-by: Jan Höppner 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rust/README.md b/rust/README.md -index 2622bba..61b0af8 100644 +index 2622bba2..61b0af80 100644 --- a/rust/README.md +++ b/rust/README.md @@ -7,21 +7,21 @@ https://www.rust-lang.org/learn/get-started @@ -833,13 +833,13 @@ index 2622bba..61b0af8 100644 } ``` -- -2.51.1 +2.53.0 From 883d28afea6ea18b1001ebf9e3d921d86be9c593 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Mon, 4 Sep 2023 14:18:50 +0200 -Subject: [PATCH 04/21] rust/**/*.rs: fix `cargo clippy` findings +Subject: [PATCH 04/22] rust/**/*.rs: fix `cargo clippy` findings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -862,7 +862,7 @@ Signed-off-by: Jan Höppner 8 files changed, 47 insertions(+), 64 deletions(-) diff --git a/rust/pv/src/brcb.rs b/rust/pv/src/brcb.rs -index 4bf5f16..9ef58e2 100644 +index 4bf5f161..9ef58e2d 100644 --- a/rust/pv/src/brcb.rs +++ b/rust/pv/src/brcb.rs @@ -205,7 +205,7 @@ mod tests { @@ -884,7 +884,7 @@ index 4bf5f16..9ef58e2 100644 assert!(matches!( BootHdrTags::from_se_image(&mut Cursor::new(bin_hdr_copy)), diff --git a/rust/pv/src/crypto.rs b/rust/pv/src/crypto.rs -index 910419e..8132e9d 100644 +index 910419e5..8132e9de 100644 --- a/rust/pv/src/crypto.rs +++ b/rust/pv/src/crypto.rs @@ -315,7 +315,7 @@ mod tests { @@ -897,7 +897,7 @@ index 910419e..8132e9d 100644 &aes_gcm_plain, ) diff --git a/rust/pv/src/req.rs b/rust/pv/src/req.rs -index cda448b..b9acd73 100644 +index cda448bf..b9acd732 100644 --- a/rust/pv/src/req.rs +++ b/rust/pv/src/req.rs @@ -451,7 +451,7 @@ mod tests { @@ -910,7 +910,7 @@ index cda448b..b9acd73 100644 let mut aad = Vec::::new(); ks.iter().for_each(|ks| aad.push(Aad::Ks(ks))); diff --git a/rust/pv/src/uvsecret/guest_secret.rs b/rust/pv/src/uvsecret/guest_secret.rs -index 8ad4fa5..8c44421 100644 +index 8ad4fa55..8c444211 100644 --- a/rust/pv/src/uvsecret/guest_secret.rs +++ b/rust/pv/src/uvsecret/guest_secret.rs @@ -105,7 +105,7 @@ mod test { @@ -923,7 +923,7 @@ index 8ad4fa5..8c44421 100644 name, id: exp_id, diff --git a/rust/pv/src/uvsecret/secret_list.rs b/rust/pv/src/uvsecret/secret_list.rs -index 724702a..6943bd3 100644 +index 724702a1..6943bd31 100644 --- a/rust/pv/src/uvsecret/secret_list.rs +++ b/rust/pv/src/uvsecret/secret_list.rs @@ -117,7 +117,7 @@ impl Display for SecretEntry { @@ -936,7 +936,7 @@ index 724702a..6943bd3 100644 Ok(()) } diff --git a/rust/pv/src/verify/helper.rs b/rust/pv/src/verify/helper.rs -index 89f92b8..a2f313b 100644 +index 89f92b87..a2f313b0 100644 --- a/rust/pv/src/verify/helper.rs +++ b/rust/pv/src/verify/helper.rs @@ -484,20 +484,20 @@ mod test { @@ -966,7 +966,7 @@ index 89f92b8..a2f313b 100644 #[test] diff --git a/rust/pv/src/verify/test.rs b/rust/pv/src/verify/test.rs -index 8a6258d..1c0d2b5 100644 +index 8a6258da..1c0d2b56 100644 --- a/rust/pv/src/verify/test.rs +++ b/rust/pv/src/verify/test.rs @@ -26,7 +26,7 @@ fn verify_sign_error(exp_raw: libc::c_int, obs: Error) { @@ -1154,7 +1154,7 @@ index 8a6258d..1c0d2b5 100644 ); verify_sign_error(23, verifier.unwrap_err()); diff --git a/rust/pv/tests/add_secret_request.rs b/rust/pv/tests/add_secret_request.rs -index 2b3e861..bf491c6 100644 +index 2b3e861e..bf491c61 100644 --- a/rust/pv/tests/add_secret_request.rs +++ b/rust/pv/tests/add_secret_request.rs @@ -18,7 +18,7 @@ use pv::{ @@ -1205,13 +1205,13 @@ index 2b3e861..bf491c6 100644 let exp = get_test_asset!("exp/asrcb/null_none_default_cuid_seven"); -- -2.51.1 +2.53.0 From 4c8072cebe9add441c42e62663d4089d14d32389 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 25 Oct 2023 15:26:14 +0200 -Subject: [PATCH 05/21] rust/pv: fix Invalid write of size 1 +Subject: [PATCH 05/22] rust/pv: fix Invalid write of size 1 Fix a valgrind finding. Fix an invalid read/write of one byte after the actual struct to clear. Not fixing this may result in a illegal write or @@ -1226,7 +1226,7 @@ Signed-off-by: Steffen Eiden 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/pv/src/secret.rs b/rust/pv/src/secret.rs -index cdef9ef..88287c8 100644 +index cdef9ef8..88287c8e 100644 --- a/rust/pv/src/secret.rs +++ b/rust/pv/src/secret.rs @@ -34,8 +34,8 @@ impl Zeroize for Vec { @@ -1240,13 +1240,13 @@ index cdef9ef..88287c8 100644 } std::sync::atomic::compiler_fence(std::sync::atomic::Ordering::SeqCst); -- -2.51.1 +2.53.0 From 49eabe2d13ea3909f4c522fefaf8db998c7ab888 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 4 Oct 2023 10:59:34 +0200 -Subject: [PATCH 06/21] rust: Create workspace +Subject: [PATCH 06/22] rust: Create workspace A workspaces simplifies the build and packaging process significantly. All build artifacts and binaries are now built in a single location @@ -1270,7 +1270,7 @@ Signed-off-by: Steffen Eiden diff --git a/rust/Cargo.toml b/rust/Cargo.toml new file mode 100644 -index 0000000..65a70a9 +index 00000000..65a70a97 --- /dev/null +++ b/rust/Cargo.toml @@ -0,0 +1,15 @@ @@ -1290,7 +1290,7 @@ index 0000000..65a70a9 +lto = true +panic = "abort" diff --git a/rust/Makefile b/rust/Makefile -index 420bafd..e4e9885 100644 +index 420bafd0..e4e98859 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -15,16 +15,17 @@ ifneq (${HAVE_CARGO},0) @@ -1385,7 +1385,7 @@ index 420bafd..e4e9885 100644 "libcurl-devel", \ "HAVE_LIBCURL=0") diff --git a/rust/README.md b/rust/README.md -index 61b0af8..16603bf 100644 +index 61b0af80..16603bf5 100644 --- a/rust/README.md +++ b/rust/README.md @@ -81,11 +81,27 @@ is a start, but can change over time. @@ -1419,7 +1419,7 @@ index 61b0af8..16603bf 100644 ### Versions diff --git a/rust/pv/Cargo.toml b/rust/pv/Cargo.toml -index 689d624..825386a 100644 +index 689d6242..825386a4 100644 --- a/rust/pv/Cargo.toml +++ b/rust/pv/Cargo.toml @@ -1,8 +1,8 @@ @@ -1442,7 +1442,7 @@ index 689d624..825386a 100644 -lto = true -panic = "abort" # release builds now do not clean up stack after panics. .1 Mb diff --git a/rust/pv/openssl_extensions/Cargo.toml b/rust/pv/openssl_extensions/Cargo.toml -index 17d4c0e..90907ce 100644 +index 17d4c0e5..90907cee 100644 --- a/rust/pv/openssl_extensions/Cargo.toml +++ b/rust/pv/openssl_extensions/Cargo.toml @@ -1,8 +1,8 @@ @@ -1457,7 +1457,7 @@ index 17d4c0e..90907ce 100644 [dependencies] foreign-types = "0.3" diff --git a/rust/pvsecret/Cargo.toml b/rust/pvsecret/Cargo.toml -index da4deab..d1e75b1 100644 +index da4deab3..d1e75b13 100644 --- a/rust/pvsecret/Cargo.toml +++ b/rust/pvsecret/Cargo.toml @@ -1,8 +1,8 @@ @@ -1480,7 +1480,7 @@ index da4deab..d1e75b1 100644 -lto = true -panic = "abort" # release builds now do not clean up stack after panics. .1 Mb diff --git a/rust/utils/Cargo.toml b/rust/utils/Cargo.toml -index 30bbbc8..215381b 100644 +index 30bbbc83..215381be 100644 --- a/rust/utils/Cargo.toml +++ b/rust/utils/Cargo.toml @@ -1,5 +1,5 @@ @@ -1492,13 +1492,13 @@ index 30bbbc8..215381b 100644 +edition.workspace = true +license.workspace = true -- -2.51.1 +2.53.0 From be47ce72f4ee7dc7ed2dafb9b89079b0c2b154fa Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 4 Oct 2023 11:08:20 +0200 -Subject: [PATCH 07/21] rust: Update dependency files +Subject: [PATCH 07/22] rust: Update dependency files With the last patch introducing the rust workspace the location of Cargo.lock has changed. Therefore, remove all crate level lock-files and @@ -1527,7 +1527,7 @@ Signed-off-by: Steffen Eiden rename rust/{pvsecret => }/Cargo.lock (77%) diff --git a/rust/.gitignore b/rust/.gitignore -index 4760f82..f9f3955 100644 +index 4760f821..f9f3955f 100644 --- a/rust/.gitignore +++ b/rust/.gitignore @@ -9,6 +9,3 @@ target/ @@ -1541,7 +1541,7 @@ diff --git a/rust/pvsecret/Cargo.lock b/rust/Cargo.lock similarity index 77% rename from rust/pvsecret/Cargo.lock rename to rust/Cargo.lock -index 1db32c2..f7d1cf0 100644 +index 1db32c29..f7d1cf0f 100644 --- a/rust/pvsecret/Cargo.lock +++ b/rust/Cargo.lock @@ -2,6 +2,15 @@ @@ -1912,13 +1912,13 @@ index 1db32c2..f7d1cf0 100644 name = "winapi" version = "0.3.9" -- -2.51.1 +2.53.0 From c25115c0d605c9c79efd8e17d4917a35603c0766 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Tue, 21 Nov 2023 13:27:21 +0100 -Subject: [PATCH 08/21] rust: Sanitize minimal dependencies +Subject: [PATCH 08/22] rust: Sanitize minimal dependencies The crate dependencies were a bit to slack. Due to the rust dependency resolver's strategy of always selecting the latest version this never @@ -1936,7 +1936,7 @@ Signed-off-by: Steffen Eiden 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/pv/Cargo.toml b/rust/pv/Cargo.toml -index 825386a..22d5fd3 100644 +index 825386a4..22d5fd34 100644 --- a/rust/pv/Cargo.toml +++ b/rust/pv/Cargo.toml @@ -5,26 +5,26 @@ edition.workspace = true @@ -1975,7 +1975,7 @@ index 825386a..22d5fd3 100644 [features] default = [] diff --git a/rust/pv/openssl_extensions/Cargo.toml b/rust/pv/openssl_extensions/Cargo.toml -index 90907ce..7bdeece 100644 +index 90907cee..7bdeece6 100644 --- a/rust/pv/openssl_extensions/Cargo.toml +++ b/rust/pv/openssl_extensions/Cargo.toml @@ -5,8 +5,8 @@ edition.workspace = true @@ -1993,7 +1993,7 @@ index 90907ce..7bdeece 100644 +openssl = "0.10.49" +openssl-sys = "0.9.85" diff --git a/rust/pvsecret/Cargo.toml b/rust/pvsecret/Cargo.toml -index d1e75b1..e236c00 100644 +index d1e75b13..e236c005 100644 --- a/rust/pvsecret/Cargo.toml +++ b/rust/pvsecret/Cargo.toml @@ -5,9 +5,9 @@ edition.workspace = true @@ -2009,13 +2009,13 @@ index d1e75b1..e236c00 100644 pv = { path = "../pv", features = ["uvsecret", "request"] } -- -2.51.1 +2.53.0 From b6009c80b112ad85ca2aa649126b913af5af253c Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 29 Nov 2023 17:06:50 +0100 -Subject: [PATCH 09/21] rust: Use default panic behaviour +Subject: [PATCH 09/22] rust: Use default panic behaviour Reviewed-by: Marc Hartmayer Signed-off-by: Steffen Eiden @@ -2025,7 +2025,7 @@ Signed-off-by: Steffen Eiden 1 file changed, 1 deletion(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml -index 65a70a9..7ba1faa 100644 +index 65a70a97..7ba1faa1 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -12,4 +12,3 @@ license = "MIT" @@ -2034,13 +2034,13 @@ index 65a70a9..7ba1faa 100644 lto = true -panic = "abort" -- -2.51.1 +2.53.0 From c4e48d060b7d92d7c6cd150728ecb55b301afa62 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Thu, 30 Nov 2023 16:02:16 +0100 -Subject: [PATCH 10/21] rust/pv: Update mockito to version 1 +Subject: [PATCH 10/22] rust/pv: Update mockito to version 1 Signed-off-by: Steffen Eiden (cherry picked from commit 21662d38e68b58bad033cdb1fca99987dd07cf78) @@ -2051,7 +2051,7 @@ Signed-off-by: Steffen Eiden 3 files changed, 465 insertions(+), 9 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock -index f7d1cf0..067be05 100644 +index f7d1cf0f..067be057 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2,6 +2,21 @@ @@ -2704,7 +2704,7 @@ index f7d1cf0..067be05 100644 name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/rust/pv/Cargo.toml b/rust/pv/Cargo.toml -index 22d5fd3..ff84526 100644 +index 22d5fd34..ff845263 100644 --- a/rust/pv/Cargo.toml +++ b/rust/pv/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1.0.139", features = ["derive"], optional = true } @@ -2717,7 +2717,7 @@ index 22d5fd3..ff84526 100644 lazy_static = "1.1" diff --git a/rust/pv/src/verify/test.rs b/rust/pv/src/verify/test.rs -index 1c0d2b5..5ca2e71 100644 +index 1c0d2b56..5ca2e712 100644 --- a/rust/pv/src/verify/test.rs +++ b/rust/pv/src/verify/test.rs @@ -14,7 +14,9 @@ use crate::test_utils::*; @@ -2732,13 +2732,13 @@ index 1c0d2b5..5ca2e71 100644 .with_body_from_file(res_path) .create() -- -2.51.1 +2.53.0 From 66783f1901dcaca6f567ad13b05acc7dbe412ff0 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 20 Dec 2023 13:31:18 +0100 -Subject: [PATCH 11/21] rust/Makefile: Fix CC/AR variables for TEST_TARGETS +Subject: [PATCH 11/22] rust/Makefile: Fix CC/AR variables for TEST_TARGETS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2751,7 +2751,7 @@ Signed-off-by: Jan Höppner 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/Makefile b/rust/Makefile -index e4e9885..fa3cf04 100644 +index e4e98859..fa3cf04d 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -37,8 +37,8 @@ endif @@ -2766,13 +2766,13 @@ index e4e9885..fa3cf04 100644 $(PV_TARGETS): .check-dep-pvtools $(PV_TARGETS) $(CARGO_TARGETS): .check-cargo .no-cross-compile -- -2.51.1 +2.53.0 From d54a8aa4d7b77338fd5511d895eadbb074b6024a Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Fri, 15 Dec 2023 11:30:14 +0100 -Subject: [PATCH 12/21] rust/pv: Provide access for SecretList members +Subject: [PATCH 12/22] rust/pv: Provide access for SecretList members MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2793,7 +2793,7 @@ Signed-off-by: Jan Höppner 2 files changed, 151 insertions(+), 21 deletions(-) diff --git a/rust/pv/src/lib.rs b/rust/pv/src/lib.rs -index d72ac93..ed89140 100644 +index d72ac93e..ed891408 100644 --- a/rust/pv/src/lib.rs +++ b/rust/pv/src/lib.rs @@ -70,7 +70,7 @@ pub mod uv { @@ -2806,7 +2806,7 @@ index d72ac93..ed89140 100644 }; } diff --git a/rust/pv/src/uvsecret/secret_list.rs b/rust/pv/src/uvsecret/secret_list.rs -index 6943bd3..72a05b2 100644 +index 6943bd31..72a05b27 100644 --- a/rust/pv/src/uvsecret/secret_list.rs +++ b/rust/pv/src/uvsecret/secret_list.rs @@ -2,13 +2,14 @@ @@ -3044,13 +3044,13 @@ index 6943bd3..72a05b2 100644 fn dump_secret_entry() { const EXP: &[u8] = &[ -- -2.51.1 +2.53.0 From e75bbd754e5912d34c0aedfe35ccedd54ca850be Mon Sep 17 00:00:00 2001 From: Harald Freudenberger Date: Fri, 1 Dec 2023 12:10:20 +0100 -Subject: [PATCH 13/21] rust/pvapconfig: Introduce new tool pvapconfig +Subject: [PATCH 13/22] rust/pvapconfig: Introduce new tool pvapconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -3091,7 +3091,7 @@ Signed-off-by: Jan Höppner create mode 100644 rust/pvapconfig/src/uv.rs diff --git a/rust/Cargo.lock b/rust/Cargo.lock -index 067be05..3a6c423 100644 +index 067be057..3a6c4238 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -792,6 +792,22 @@ dependencies = [ @@ -3118,7 +3118,7 @@ index 067be05..3a6c423 100644 name = "pvsecret" version = "0.9.0" diff --git a/rust/Cargo.toml b/rust/Cargo.toml -index 7ba1faa..f358dbd 100644 +index 7ba1faa1..f358dbd9 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,7 @@ @@ -3130,7 +3130,7 @@ index 7ba1faa..f358dbd 100644 "utils", ] diff --git a/rust/Makefile b/rust/Makefile -index fa3cf04..818694d 100644 +index fa3cf04d..818694d0 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -19,7 +19,7 @@ ifneq (${HAVE_CARGO},0) @@ -3144,7 +3144,7 @@ index fa3cf04..818694d 100644 CARGO_TEST_TARGETS += $(addsuffix .test,pv $(PV_TARGETS)) diff --git a/rust/pvapconfig/Cargo.toml b/rust/pvapconfig/Cargo.toml new file mode 100644 -index 0000000..2a69468 +index 00000000..2a69468c --- /dev/null +++ b/rust/pvapconfig/Cargo.toml @@ -0,0 +1,19 @@ @@ -3169,7 +3169,7 @@ index 0000000..2a69468 +utils = { path = "../utils" } diff --git a/rust/pvapconfig/README.md b/rust/pvapconfig/README.md new file mode 100644 -index 0000000..d30cb76 +index 00000000..d30cb76d --- /dev/null +++ b/rust/pvapconfig/README.md @@ -0,0 +1,9 @@ @@ -3184,7 +3184,7 @@ index 0000000..d30cb76 +within an IBM Secure Execution guest. diff --git a/rust/pvapconfig/man/pvapconfig.1 b/rust/pvapconfig/man/pvapconfig.1 new file mode 100644 -index 0000000..73ce8ce +index 00000000..73ce8cea --- /dev/null +++ b/rust/pvapconfig/man/pvapconfig.1 @@ -0,0 +1,174 @@ @@ -3364,7 +3364,7 @@ index 0000000..73ce8ce +\fBpvsecret\fR(1), \fBlszcrypt\fR(8), \fBchzcrypt\fR(8) diff --git a/rust/pvapconfig/src/ap.rs b/rust/pvapconfig/src/ap.rs new file mode 100644 -index 0000000..0b88235 +index 00000000..0b882359 --- /dev/null +++ b/rust/pvapconfig/src/ap.rs @@ -0,0 +1,817 @@ @@ -4187,7 +4187,7 @@ index 0000000..0b88235 +} diff --git a/rust/pvapconfig/src/cli.rs b/rust/pvapconfig/src/cli.rs new file mode 100644 -index 0000000..e7fd283 +index 00000000..e7fd2833 --- /dev/null +++ b/rust/pvapconfig/src/cli.rs @@ -0,0 +1,63 @@ @@ -4256,7 +4256,7 @@ index 0000000..e7fd283 +} diff --git a/rust/pvapconfig/src/config.rs b/rust/pvapconfig/src/config.rs new file mode 100644 -index 0000000..28d2ac7 +index 00000000..28d2ac75 --- /dev/null +++ b/rust/pvapconfig/src/config.rs @@ -0,0 +1,391 @@ @@ -4653,7 +4653,7 @@ index 0000000..28d2ac7 +} diff --git a/rust/pvapconfig/src/helper.rs b/rust/pvapconfig/src/helper.rs new file mode 100644 -index 0000000..c4670ce +index 00000000..c4670cef --- /dev/null +++ b/rust/pvapconfig/src/helper.rs @@ -0,0 +1,272 @@ @@ -4931,7 +4931,7 @@ index 0000000..c4670ce +} diff --git a/rust/pvapconfig/src/main.rs b/rust/pvapconfig/src/main.rs new file mode 100644 -index 0000000..07899cd +index 00000000..07899cd9 --- /dev/null +++ b/rust/pvapconfig/src/main.rs @@ -0,0 +1,668 @@ @@ -5605,7 +5605,7 @@ index 0000000..07899cd +} diff --git a/rust/pvapconfig/src/uv.rs b/rust/pvapconfig/src/uv.rs new file mode 100644 -index 0000000..2f98bd5 +index 00000000..2f98bd5e --- /dev/null +++ b/rust/pvapconfig/src/uv.rs @@ -0,0 +1,105 @@ @@ -5715,13 +5715,13 @@ index 0000000..2f98bd5 + } +} -- -2.51.1 +2.53.0 From 6b69de3c519971a88c5953075586b322e1efdc3e Mon Sep 17 00:00:00 2001 From: Joern Siglen Date: Wed, 25 Oct 2023 15:01:11 +0200 -Subject: [PATCH 14/21] dbginfo.sh: enhance ethtool collection for ROCE +Subject: [PATCH 14/22] dbginfo.sh: enhance ethtool collection for ROCE (RHEL-24110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -5739,7 +5739,7 @@ Signed-off-by: Jan Höppner 1 file changed, 2 insertions(+) diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh -index 9226a8b..f70cf6e 100755 +index 9226a8bb..f70cf6ee 100755 --- a/scripts/dbginfo.sh +++ b/scripts/dbginfo.sh @@ -954,6 +954,8 @@ collect_ethtool() { @@ -5752,13 +5752,13 @@ index 9226a8b..f70cf6e 100755 else pr_skip "ethtool: no devices" -- -2.51.1 +2.53.0 From 90943f11e0feef6bc6cde3bf0b80ad0a21c55d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 10 Apr 2024 11:27:58 +0200 -Subject: [PATCH 15/21] rust/pv: Support `Armonk` in IBM signing key subject +Subject: [PATCH 15/22] rust/pv: Support `Armonk` in IBM signing key subject (RHEL-30398) New IBM signing keys will have Armonk as locality in the subject. @@ -5779,7 +5779,7 @@ Signed-off-by: Steffen Eiden 3 files changed, 73 insertions(+), 71 deletions(-) diff --git a/rust/pv/src/verify.rs b/rust/pv/src/verify.rs -index 54fe435..3482f8c 100644 +index 54fe4357..3482f8c8 100644 --- a/rust/pv/src/verify.rs +++ b/rust/pv/src/verify.rs @@ -3,10 +3,11 @@ @@ -5871,7 +5871,7 @@ index 54fe435..3482f8c 100644 if !self.offline { diff --git a/rust/pv/src/verify/helper.rs b/rust/pv/src/verify/helper.rs -index a2f313b..732baef 100644 +index a2f313b0..732baef5 100644 --- a/rust/pv/src/verify/helper.rs +++ b/rust/pv/src/verify/helper.rs @@ -14,7 +14,7 @@ use openssl::{ @@ -6020,7 +6020,7 @@ index a2f313b..732baef 100644 fn is_ibm_z_sign_key() { let ibm_crt = load_gen_cert("ibm.crt"); diff --git a/rust/pv/src/verify/test.rs b/rust/pv/src/verify/test.rs -index 5ca2e71..e4c60c5 100644 +index 5ca2e712..e4c60c57 100644 --- a/rust/pv/src/verify/test.rs +++ b/rust/pv/src/verify/test.rs @@ -99,7 +99,6 @@ fn verify_online() { @@ -6064,13 +6064,13 @@ index 5ca2e71..e4c60c5 100644 verifier.verify(&hkd_exp), Err(Error::HkdVerify(AfterValidity)) -- -2.51.1 +2.53.0 From e1423607a66ee37f8ae581fbf5fa013f5ab80ae8 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Thu, 14 Mar 2024 16:05:09 +0000 -Subject: [PATCH 16/21] genprotimg: support `Armonk` in IBM signing key subject +Subject: [PATCH 16/22] genprotimg: support `Armonk` in IBM signing key subject (RHEL-30398) New IBM signing certificates will have 'Armonk' as locality in the @@ -6092,7 +6092,7 @@ Signed-off-by: Steffen Eiden 3 files changed, 104 insertions(+), 110 deletions(-) diff --git a/genprotimg/src/include/pv_crypto_def.h b/genprotimg/src/include/pv_crypto_def.h -index 3635433..49710dc 100644 +index 3635433c..49710dc1 100644 --- a/genprotimg/src/include/pv_crypto_def.h +++ b/genprotimg/src/include/pv_crypto_def.h @@ -17,7 +17,8 @@ @@ -6106,7 +6106,7 @@ index 3635433..49710dc 100644 #define PV_IBM_Z_SUBJECT_ORGANIZATION_NAME "International Business Machines Corporation" #define PV_IBM_Z_SUBJECT_STATE "New York" diff --git a/genprotimg/src/utils/crypto.c b/genprotimg/src/utils/crypto.c -index e3bbf1b..86565b9 100644 +index e3bbf1b2..86565b99 100644 --- a/genprotimg/src/utils/crypto.c +++ b/genprotimg/src/utils/crypto.c @@ -664,62 +664,9 @@ static gboolean x509_name_data_by_nid_equal(X509_NAME *name, gint nid, @@ -6384,7 +6384,7 @@ index e3bbf1b..86565b9 100644 akid = X509_get_ext_d2i(cert, NID_authority_key_identifier, NULL, NULL); if (akid && X509_check_akid(issuer, akid) != X509_V_OK) { diff --git a/genprotimg/src/utils/crypto.h b/genprotimg/src/utils/crypto.h -index fdf66de..e45e57d 100644 +index fdf66de2..e45e57df 100644 --- a/genprotimg/src/utils/crypto.h +++ b/genprotimg/src/utils/crypto.h @@ -75,6 +75,7 @@ void x509_pair_free(x509_pair *pair); @@ -6396,13 +6396,13 @@ index fdf66de..e45e57d 100644 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(BIO, BIO_free_all) WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(BN_CTX, BN_CTX_free) -- -2.51.1 +2.53.0 From 1605e9c0033e245f8a6690e2ce95a27e383722df Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Tue, 12 Mar 2024 10:14:43 +0100 -Subject: [PATCH 17/21] libpv: Support `Armonk` in IBM signing key subject +Subject: [PATCH 17/22] libpv: Support `Armonk` in IBM signing key subject (RHEL-30398) New IBM signing keys will have Armonk as locality in the subject. @@ -6421,7 +6421,7 @@ Signed-off-by: Steffen Eiden 2 files changed, 102 insertions(+), 49 deletions(-) diff --git a/include/libpv/cert.h b/include/libpv/cert.h -index bceb3c6..aebe33b 100644 +index bceb3c65..aebe33ba 100644 --- a/include/libpv/cert.h +++ b/include/libpv/cert.h @@ -16,7 +16,8 @@ @@ -6435,7 +6435,7 @@ index bceb3c6..aebe33b 100644 #define PV_IBM_Z_SUBJECT_ORGANIZATION_NAME "International Business Machines Corporation" #define PV_IBM_Z_SUBJECT_STATE "New York" diff --git a/libpv/cert.c b/libpv/cert.c -index c8bb8cc..f4774fc 100644 +index c8bb8cc3..f4774fcb 100644 --- a/libpv/cert.c +++ b/libpv/cert.c @@ -857,7 +857,7 @@ static gboolean x509_name_data_by_nid_equal(X509_NAME *name, int nid, const char @@ -6645,13 +6645,13 @@ index c8bb8cc..f4774fc 100644 for (int i = 0; i < sk_X509_CRL_num(ret); i++) { X509_CRL *crl = sk_X509_CRL_value(ret, i); -- -2.51.1 +2.53.0 From 3bd5cce64692d4b630b313cf465a55595971bed4 Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 20 Mar 2024 15:36:52 +0100 -Subject: [PATCH 18/21] pvattest: Fix root-ca parsing (RHEL-30398) +Subject: [PATCH 18/22] pvattest: Fix root-ca parsing (RHEL-30398) The parser setup falsely set the argument type as filename array, but code expected a single filename. Fixed by setting up the parser @@ -6666,7 +6666,7 @@ Signed-off-by: Steffen Eiden 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pvattest/src/argparse.c b/pvattest/src/argparse.c -index fe5662f..5924ddc 100644 +index fe5662f9..5924ddc8 100644 --- a/pvattest/src/argparse.c +++ b/pvattest/src/argparse.c @@ -192,13 +192,13 @@ static gboolean hex_str_toull(const char *nptr, uint64_t *dst, GError **error) @@ -6691,13 +6691,13 @@ index fe5662f..5924ddc 100644 /* NOTE REQUIRED */ -- -2.51.1 +2.53.0 From a1b83b44def87915acaf0d9668bdf96824d0e781 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Thu, 3 Apr 2025 11:26:47 +0200 -Subject: [PATCH 19/21] zkey: Adjust CCA host library version detection for +Subject: [PATCH 19/22] zkey: Adjust CCA host library version detection for newer CCA versions (RHEL-105487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -6716,7 +6716,7 @@ Signed-off-by: Jan Höppner 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zkey/cca.c b/zkey/cca.c -index 71c08ad..9d79c4b 100644 +index 71c08ad1..9d79c4b3 100644 --- a/zkey/cca.c +++ b/zkey/cca.c @@ -91,7 +91,6 @@ static int get_cca_version(struct cca_lib *cca, bool verbose) @@ -6748,13 +6748,13 @@ index 71c08ad..9d79c4b 100644 warnx("CCA formware version is invalid: %s", version_data); return -EINVAL; -- -2.51.1 +2.53.0 From 8b98ad7e7e273b2327ad50bdf31935d4a439a618 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Thu, 11 Sep 2025 08:37:38 +0200 -Subject: [PATCH 20/21] libekmfweb: Fix generation of certificate or CSR with +Subject: [PATCH 20/22] libekmfweb: Fix generation of certificate or CSR with RSA-PSS instead of RSA (RHEL-114130) Currently a certificate or certificate signing request generated by the @@ -6774,7 +6774,7 @@ Signed-off-by: Steffen Eiden 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libekmfweb/ekmfweb.c b/libekmfweb/ekmfweb.c -index ee25fc0..3a822e7 100644 +index ee25fc08..3a822e78 100644 --- a/libekmfweb/ekmfweb.c +++ b/libekmfweb/ekmfweb.c @@ -5099,14 +5099,15 @@ int ekmf_generate_csr(const struct ekmf_config *config, @@ -6816,13 +6816,13 @@ index ee25fc0..3a822e7 100644 if (rc != 0) { pr_verbose(verbose, "SK_OPENSSL_generate_ss_cert failed " -- -2.51.1 +2.53.0 From ad8dcda916c7c7ec4294fff11e1858e3cbd9ec2f Mon Sep 17 00:00:00 2001 From: Eduard Shishkin Date: Mon, 19 Feb 2024 17:25:04 +0100 -Subject: [PATCH 21/21] dasdfmt: Change mode default (RHEL-121638) +Subject: [PATCH 21/22] dasdfmt: Change mode default (RHEL-121638) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -6855,7 +6855,7 @@ Signed-off-by: Jan Höppner 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dasdfmt/dasdfmt.8 b/dasdfmt/dasdfmt.8 -index bef5c09..b531e15 100644 +index bef5c097..b531e155 100644 --- a/dasdfmt/dasdfmt.8 +++ b/dasdfmt/dasdfmt.8 @@ -118,16 +118,16 @@ Specify the \fImode\fR to be used to format the device. Valid modes are: @@ -6885,7 +6885,7 @@ index bef5c09..b531e15 100644 .IP expand Format all unformatted tracks at the end of the target DASD. This mode assumes diff --git a/dasdfmt/dasdfmt.c b/dasdfmt/dasdfmt.c -index 2065e12..a49e41c 100644 +index 2065e12e..a49e41c0 100644 --- a/dasdfmt/dasdfmt.c +++ b/dasdfmt/dasdfmt.c @@ -1230,7 +1230,7 @@ static void dasdfmt_find_start(unsigned int cylinders, unsigned int heads, @@ -6946,5 +6946,53 @@ index 2065e12..a49e41c 100644 /* -- -2.51.1 +2.53.0 + + +From e75eaad672b9352f1ceb0e90e525b7c988ed55ea Mon Sep 17 00:00:00 2001 +From: Aswin Karuvally +Date: Sun, 1 Feb 2026 18:39:38 +0530 +Subject: [PATCH 22/22] hsci: Automatically set appropriate MTU for HSCI + (RHEL-153548) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +At present, the hsci tool creates HiperSockets Converged Interface +(HSCI) with MTU of 1500 bytes regardless of the values of MTU for the +external and HiperSockets interface from which it is formed. This can +degrade performance or worse, affect network connectivity through the +converged interface. + +Update the tool to automatically set MTU of HSCI as the lower of the +MTU values of external and HiperSockets interface. + +Reviewed-by: Alexandra Winter +Signed-off-by: Aswin Karuvally +Signed-off-by: Jan Höppner +(cherry picked from commit 11f2ccb9570569a57ac0ef0148efcd9b35d7a6b6) +--- + hsci/hsci | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/hsci/hsci b/hsci/hsci +index 5540e82f..8f884c9a 100755 +--- a/hsci/hsci ++++ b/hsci/hsci +@@ -365,6 +365,13 @@ function add_hsci { + fi + fi + ++ #### Set MTU for the veth pair ++ ndev_mtu="$(cat /sys/class/net/${ndev}/mtu)" ++ hsdev_mtu="$(cat /sys/class/net/${hsdev}/mtu)" ++ hsci_mtu=$(( ndev_mtu < hsdev_mtu ? ndev_mtu : hsdev_mtu )) ++ ip link set dev $hscibp mtu $hsci_mtu ++ ip link set dev $hsci mtu $hsci_mtu ++ + #### Set veth pair to UP + ip link set dev $hscibp up >/dev/null 2>&1 + if [ $? -ne 0 ]; then +-- +2.53.0 diff --git a/s390utils.spec b/s390utils.spec index 481f348..3c38e26 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -18,7 +18,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.29.0 -Release: 3%{?dist}.4 +Release: 3%{?dist}.5 Epoch: 2 License: MIT #URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html @@ -1174,6 +1174,10 @@ User-space development files for the s390/s390x architecture. %changelog +* Wed Apr 22 2026 Dan Horák - 2:2.29.0-3.5 +- hsci: Automatically set appropriate MTU for HSCI (RHEL-153548) +- Resolves: RHEL-153548 + * Mon Nov 03 2025 Dan Horák - 2:2.29.0-3.4 - dasdfmt: Change mode default (RHEL-121638) - Resolves: RHEL-121638