diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 05:56:56 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-21 18:09:09 +1100 |
| commit | 4a05d789b86314fef7303824f69defbc6b96ed60 (patch) | |
| tree | 7bce80ad334131e950c21d5d02393eacd223bd51 /sshkey.c | |
| parent | 881aded0389d999375f926051491a944c6d8752b (diff) | |
| download | openssh-git-4a05d789b86314fef7303824f69defbc6b96ed60.tar.gz | |
upstream: fix ssh-keygen not displaying authenticator touch
prompt; reported by jmc@
OpenBSD-Commit-ID: 04d4f582fc194eb3897ebcbfe286c49958ba2859
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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. @@ -2080,6 +2080,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; |