diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-11-25 00:57:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-25 12:25:53 +1100 |
commit | 26cb128b31efdd5395153f4943f5be3eddc07033 (patch) | |
tree | 39115fdadf96c85d8c3af0eb58bc066283f03485 /ssh-keygen.c | |
parent | daeaf4136927c2a82af1399022103d67ff03f74a (diff) |
upstream: Print a key touch reminder when generating a security
key. Most keys require a touch to authorize the operation.
OpenBSD-Commit-ID: 7fe8b23edbf33e1bb81741b9f25e9a63be5f6b68
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index e939c5b57..a5d09c2a1 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.372 2019/11/25 00:55:58 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.373 2019/11/25 00:57:27 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -3294,6 +3294,11 @@ main(int argc, char **argv) | |||
3294 | #ifndef ENABLE_SK | 3294 | #ifndef ENABLE_SK |
3295 | fatal("Security key support was disabled at compile time"); | 3295 | fatal("Security key support was disabled at compile time"); |
3296 | #else /* ENABLE_SK */ | 3296 | #else /* ENABLE_SK */ |
3297 | if (!quiet) { | ||
3298 | printf("You may need to touch your security key " | ||
3299 | "to authorize key generation.\n"); | ||
3300 | } | ||
3301 | fflush(stdout); | ||
3297 | if (sshsk_enroll(type, sk_provider, | 3302 | if (sshsk_enroll(type, sk_provider, |
3298 | cert_key_id == NULL ? "ssh:" : cert_key_id, | 3303 | cert_key_id == NULL ? "ssh:" : cert_key_id, |
3299 | sk_flags, NULL, &private, NULL) != 0) | 3304 | sk_flags, NULL, &private, NULL) != 0) |