summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-10-13 16:51:19 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-10-13 16:51:19 +0200
commitc3cc016651bf98c6878569be94a9e7e19ae681bf (patch)
tree8f3e1e29af5ac57389c2a04e591d66c144ddd3e6
parent414081b3f7ac86d1f3c2d4b26fca11650d60914a (diff)
downloadgnutls-c3cc016651bf98c6878569be94a9e7e19ae681bf.tar.gz
tools: removed redudant messages on PIN re-use
-rw-r--r--src/common.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common.c b/src/common.c
index 15376d4b05..df2b431423 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1057,17 +1057,19 @@ pin_callback(void *user, int attempt, const char *token_url,
}
}
- printf("Token '%s' with URL '%s' ", token_label, token_url);
- printf("requires %s PIN\n", desc);
-
password = getenv(env);
if (password == NULL) /* compatibility */
password = getenv("GNUTLS_PIN");
if (password == NULL && (info == NULL || info->batch == 0)) {
+ fprintf(stderr, "Token '%s' with URL '%s' ", token_label, token_url);
+ fprintf(stderr, "requires %s PIN\n", desc);
+
password = getpass("Enter PIN: ");
} else {
if (flags & GNUTLS_PIN_WRONG) {
+ fprintf(stderr, "Token '%s' with URL '%s' ", token_label, token_url);
+ fprintf(stderr, "requires %s PIN\n", desc);
fprintf(stderr, "Cannot continue with a wrong password in the environment.\n");
exit(1);
}