]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Don't omit ssh-keygen -y from usage when built without
authordtucker@openbsd.org <dtucker@openbsd.org>
Sat, 24 Jul 2021 02:51:14 +0000 (02:51 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 24 Jul 2021 04:22:26 +0000 (14:22 +1000)
OpenSSL.  It is actually available, albeit only for ed25519 keys.

OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674

ssh-keygen.c

index 324c75cf5db4beb45f168caf14c095b6ce46c594..07910115fd1cbd6df856466f0f042a7b12616fa4 100644 (file)
@@ -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");