From 22244fff659886ca7f68b41d8f694b163ef4cddb Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 3 Nov 2015 10:57:56 -0800 Subject: [PATCH] improve password challenge messaging when using yubikey Signed-off-by: David Lawrence (github: endophage) --- pkg/passphrase/passphrase.go | 4 +++- signer/api/ecdsa_hardware_crypto_service.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/passphrase/passphrase.go b/pkg/passphrase/passphrase.go index 9359e0efc0..b00368fa8e 100644 --- a/pkg/passphrase/passphrase.go +++ b/pkg/passphrase/passphrase.go @@ -125,8 +125,10 @@ func PromptRetrieverWithInOut(in io.Reader, out io.Writer, aliasMap map[string]s if createNew { fmt.Fprintf(out, "Enter passphrase for new %s key with id %s: ", displayAlias, keyName) + } else if displayAlias == "yubikey" { + fmt.Fprintf(out, "Enter the %s for the attached Yubikey: ", keyName) } else { - fmt.Fprintf(out, "Enter key passphrase for %s key with id %s: ", displayAlias, keyName) + fmt.Fprintf(out, "Enter passphrase for %s key with id %s: ", displayAlias, keyName) } passphrase, err := stdin.ReadBytes('\n') diff --git a/signer/api/ecdsa_hardware_crypto_service.go b/signer/api/ecdsa_hardware_crypto_service.go index 4b68240f0a..8da450e7d6 100644 --- a/signer/api/ecdsa_hardware_crypto_service.go +++ b/signer/api/ecdsa_hardware_crypto_service.go @@ -387,7 +387,7 @@ func login(ctx *pkcs11.Ctx, session pkcs11.SessionHandle, passRetriever passphra if userFlag == pkcs11.CKU_SO { user = "SO Pin" } else { - user = "Pin" + user = "User Pin" } passwd, giveup, err := passRetriever(user, "yubikey", false, attempts) // Check if the passphrase retriever got an error or if it is telling us to give up