From a84d753c4a299c10c1d75af881a622012556abc8 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Thu, 23 Jan 2020 20:45:45 +0100 Subject: [PATCH] Updates generate_key to accept output directory. It stores the keys in the current dir by default. --- apps/generate_key.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/generate_key.py b/apps/generate_key.py index 74ba84c..30c1b26 100644 --- a/apps/generate_key.py +++ b/apps/generate_key.py @@ -30,14 +30,21 @@ def save_pk(pk, filename): if __name__ == "__main__": name = "pisa" + output_dir = "." - opts, _ = getopt(argv[1:], "n:", ["name"]) + opts, _ = getopt(argv[1:], "n:d:", ["name", "dir"]) for opt, arg in opts: if opt in ["-n", "--name"]: name = arg - SK_FILE_NAME = "../{}_sk.der".format(name) - PK_FILE_NAME = "../{}_pk.der".format(name) + if opt in ["-d", "--dir"]: + output_dir = arg + + if output_dir.endswith("/"): + output_dir = output_dir[:-1] + + SK_FILE_NAME = "{}/{}_sk.der".format(output_dir, name) + PK_FILE_NAME = "{}/{}_pk.der".format(output_dir, name) if os.path.exists(SK_FILE_NAME): print('A key with name "{}" already exists. Aborting.'.format(SK_FILE_NAME))