diff options
| author |   djm <djm@openbsd.org> | 2020-01-21 05:56:56 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-21 05:56:56 +0000 |
| commit | 56ca7242a5e797da370bcd3d4ee5cec089fa3727 (patch) | |
| tree | 2aa684fbe9ff44dc5ea54aabe70555cf7401c14e /usr.bin/ssh/sshkey.c | |
| parent | a little more verbosity in sign_and_send_pubkey() debug messages (diff) | |
| download | wireguard-openbsd-56ca7242a5e797da370bcd3d4ee5cec089fa3727.tar.xz wireguard-openbsd-56ca7242a5e797da370bcd3d4ee5cec089fa3727.zip | |
fix ssh-keygen not displaying authenticator touch prompt;
reported by jmc@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 7e5be5bc17f..00dd205ea61 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.98 2019/12/30 09:23:28 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.99 2020/01/21 05:56:56 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2041,6 +2041,9 @@ sshkey_shield_private(struct sshkey *k) enc = prekey = NULL; /* transferred */ enclen = 0; + /* preserve key fields that are required for correct operation */ + k->sk_flags = kswap->sk_flags; + /* success */ r = 0; |