Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Honor digits even for challenge #429

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Honor digits even for challenge #429

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a48635
Honor digits even for challenge
jamiehankins Jul 9, 2021
d7b7ed8
Fix errant whitespace.
jamiehankins Jul 9, 2021
2bec764
Looks like black wants double quotes.
jamiehankins Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ykman/cli/otp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,8 @@ def chalresp(ctx, slot, key, totp, touch, force, generate):
@click.option(
"-d",
"--digits",
type=click.Choice(["6", "8"]),
default="6",
type=click.Choice(["0", "6", "8"]),
default="0",
help="Number of digits in generated TOTP code (default: 6).",
)
@click.pass_context
Expand Down Expand Up @@ -633,7 +633,11 @@ def on_keepalive(status):
setattr(on_keepalive, "prompted", True)

response = session.calculate_hmac_sha1(slot, challenge, event, on_keepalive)
if totp:

if totp and digits == "0":
digits = "6"

if digits != "0":
value = format_oath_code(response, int(digits))
else:
value = response.hex()
Expand Down