From 8d1a7fecd04e620138a3828d58900d35a396c33a Mon Sep 17 00:00:00 2001 From: Jens Remus Date: Thu, 13 Dec 2018 14:45:55 +0100 Subject: [PATCH] zkey: Use libutil provided path functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jens Remus Acked-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/keystore.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/zkey/keystore.c b/zkey/keystore.c index 271e08b8..63a3c4f0 100644 --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -133,14 +133,7 @@ static int _keystore_get_key_filenames(struct keystore *keystore, */ static int _keystore_reencipher_key_exists(struct key_filenames *file_names) { - struct stat sb; - int rc; - - rc = stat(file_names->renc_filename, &sb); - if (rc == 0 && !S_ISREG(sb.st_mode)) - rc = 1; - - return !rc; + return util_path_is_reg_file("%s", file_names->renc_filename); } /** @@ -153,20 +146,14 @@ static int _keystore_reencipher_key_exists(struct key_filenames *file_names) */ static int _keystore_exists_keyfiles(struct key_filenames *file_names) { - struct stat sb_skey, sb_info; - int rc_skey, rc_info; + bool rc_skey, rc_info; - rc_skey = stat(file_names->skey_filename, &sb_skey); - if (rc_skey == 0 && !S_ISREG(sb_skey.st_mode)) - rc_skey = 1; + rc_skey = util_path_is_reg_file("%s", file_names->skey_filename); + rc_info = util_path_is_reg_file("%s", file_names->info_filename); - rc_info = stat(file_names->info_filename, &sb_info); - if (rc_info == 0 && !S_ISREG(sb_info.st_mode)) - rc_info = 1; - - if (rc_skey == 0 && rc_info == 0) + if (rc_skey && rc_info) return 1; - if (rc_skey != 0 && rc_info != 0 && + if (!rc_skey && !rc_info && _keystore_reencipher_key_exists(file_names) == 0) return 0; return -1;