From 9fb99e70517cdd4d3e897b2d4d5154422b38b02a Mon Sep 17 00:00:00 2001 From: nils Date: Fri, 25 Jun 2004 15:44:33 +0000 Subject: [PATCH] use opt_passphrase, if present, before asking the user patch supplied by Michael Bell git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1804 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/tools/pkcs15-init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c index 9a059ae1..eec2c63e 100644 --- a/src/tools/pkcs15-init.c +++ b/src/tools/pkcs15-init.c @@ -1404,6 +1404,9 @@ do_read_private_key(const char *filename, const char *format, char *passphrase = NULL; int r; + if (opt_passphrase) + passphrase = opt_passphrase; + while (1) { if (!format || !strcasecmp(format, "pem")) { r = do_read_pem_private_key(filename, passphrase, pk); @@ -1420,8 +1423,7 @@ do_read_private_key(const char *filename, const char *format, if (r >= 0 || passphrase) break; - if ((passphrase = opt_passphrase) != 0) - continue; + /* second try ... */ passphrase = getpass("Please enter passphrase " "to unlock secret key: "); if (!passphrase)