From ec04a1846e3b9e97849890266a9a00cc77bc8fd1 Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Thu, 16 Feb 2023 13:05:38 +0100 Subject: [PATCH] lszcrypt: use type-filter option also for sub-devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tools lszcrypt provides filter options for card types. Use these options not only for devices (cards), but also for sub-devices (domains). Signed-off-by: Holger Dengler Reviewed-by: Harald Freudenberger Signed-off-by: Jan Höppner --- zconf/zcrypt/lszcrypt.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/zconf/zcrypt/lszcrypt.c b/zconf/zcrypt/lszcrypt.c index bc7799e6..717dde75 100644 --- a/zconf/zcrypt/lszcrypt.c +++ b/zconf/zcrypt/lszcrypt.c @@ -614,6 +614,8 @@ static void read_subdev_rec_verbose(struct util_rec *rec, const char *grp_dev, static void show_subdevice(struct util_rec *rec, const char *grp_dev, const char *sub_dev) { + char type[16], t = '\0'; + if (!util_path_is_dir("%s/%s", grp_dev, sub_dev)) errx(EXIT_FAILURE, "Error - cryptographic device %s/%s does not exist.", grp_dev, sub_dev); @@ -630,6 +632,14 @@ static void show_subdevice(struct util_rec *rec, const char *grp_dev, return; util_rec_set(rec, "card", sub_dev); + if (util_file_read_line(type, sizeof(type), "%s/type", grp_dev) == 0) + t = type[strlen(type) - 1]; + + if ((t == 'A' && !l.showaccel) || + (t == 'C' && !l.showcca) || + (t == 'P' && !l.showep11)) + return; + read_subdev_rec_default(rec, grp_dev, sub_dev); read_subdev_rec_verbose(rec, grp_dev, sub_dev);