From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Sat, 24 Jul 2021 02:51:14 +0000 (+0000)
Subject: upstream: Don't omit ssh-keygen -y from usage when built without
X-Git-Tag: V_8_7_P1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5ccb5895d39cd627ad9e7b2c671d2587616100d;p=thirdparty%2Fopenssh-portable.git

upstream: Don't omit ssh-keygen -y from usage when built without

OpenSSL.  It is actually available, albeit only for ed25519 keys.

OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 324c75cf5..07910115f 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.433 2021/07/24 02:08:13 dtucker Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.434 2021/07/24 02:51:14 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3115,8 +3115,8 @@ usage(void)
 #ifdef WITH_OPENSSL
 	    "       ssh-keygen -i [-f input_keyfile] [-m key_format]\n"
 	    "       ssh-keygen -e [-f input_keyfile] [-m key_format]\n"
-	    "       ssh-keygen -y [-f input_keyfile]\n"
 #endif
+	    "       ssh-keygen -y [-f input_keyfile]\n"
 	    "       ssh-keygen -c [-a rounds] [-C comment] [-f keyfile] [-P passphrase]\n"
 	    "       ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n"
 	    "       ssh-keygen -B [-f input_keyfile]\n");