From 4a05d789b86314fef7303824f69defbc6b96ed60 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 21 Jan 2020 05:56:56 +0000 Subject: [PATCH] upstream: fix ssh-keygen not displaying authenticator touch prompt; reported by jmc@ OpenBSD-Commit-ID: 04d4f582fc194eb3897ebcbfe286c49958ba2859 --- sshkey.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sshkey.c b/sshkey.c index 6ccd0e0b9..57995ee68 100644 --- a/sshkey.c +++ b/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. @@ -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;