From 0285264af59b7bd0716c54fec990037012810f4d Mon Sep 17 00:00:00 2001 From: "viktor.tarasov" Date: Mon, 30 Aug 2010 16:37:15 +0000 Subject: [PATCH] #73: pkcs15-tool: when changing PIN, print message if no PIN value supplied git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4658 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/tools/pkcs15-tool.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tools/pkcs15-tool.c b/src/tools/pkcs15-tool.c index f71277bd..db0f9885 100644 --- a/src/tools/pkcs15-tool.c +++ b/src/tools/pkcs15-tool.c @@ -1218,13 +1218,14 @@ static int change_pin(void) printf("New PIN value will be prompted with pinpad.\n"); break; } - if (newpin == NULL || strlen((char *) newpin) == 0) + if (newpin == NULL || strlen((char *) newpin) == 0) { + fprintf(stderr, "No new PIN value supplied.\n"); return 2; + } newpin2 = get_pin("Enter new PIN again", pin_obj); - if (newpin2 == NULL || strlen((char *) newpin2) == 0) - return 2; - if (strcmp((char *) newpin, (char *) newpin2) == 0) { + if (newpin2 && strlen((char *) newpin2) && + strcmp((char *) newpin, (char *) newpin2) == 0) { free(newpin2); break; }