mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
zkey: Enhance APQN cross check to check for firmware version
EP11 secure keys require a certain firmware version. Enhance the APQN cross check to not only check for a minimum card level, but also for a minimum firmware version. Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com> Reviewed-by: Harald Freudenberger <freude@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
committed by
Jan Höppner
parent
a7e47685e0
commit
88e6a18f96
+5
-2
@@ -1179,6 +1179,7 @@ static int command_generate(void)
|
||||
|
||||
rc = cross_check_apqns(NULL, NULL,
|
||||
get_min_card_level_for_keytype(g.key_type),
|
||||
get_min_fw_version_for_keytype(g.key_type),
|
||||
get_card_type_for_keytype(g.key_type),
|
||||
true, g.verbose);
|
||||
if (rc == -EINVAL)
|
||||
@@ -1510,6 +1511,7 @@ static int command_validate_file(void)
|
||||
|
||||
rc = cross_check_apqns(NULL, mkvp,
|
||||
get_min_card_level_for_keytype(key_type),
|
||||
get_min_fw_version_for_keytype(key_type),
|
||||
get_card_type_for_keytype(key_type),
|
||||
true, g.verbose);
|
||||
if (rc == -EINVAL)
|
||||
@@ -1786,8 +1788,9 @@ static int command_convert_file(void)
|
||||
}
|
||||
|
||||
rc = cross_check_apqns(NULL, NULL, min_level,
|
||||
get_card_type_for_keytype(g.key_type), true,
|
||||
g.verbose);
|
||||
get_min_fw_version_for_keytype(g.key_type),
|
||||
get_card_type_for_keytype(g.key_type),
|
||||
true, g.verbose);
|
||||
if (rc == -EINVAL)
|
||||
return EXIT_FAILURE;
|
||||
if (rc != 0 && rc != -ENOTSUP) {
|
||||
|
||||
Reference in New Issue
Block a user