summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-07-24 02:08:13 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-07-24 14:22:26 +1000
commit819d57ac23469f1f03baa8feb38ddefbada90fdc (patch)
tree23a579bcefe9a02c6a5e6e8a31c4f2d8fdab3f23
parentb6673b1d2ee90b4690ee84f634efe40225423c38 (diff)
upstream: Exclude key conversion options from usage when built
without OpenSSL since those are not available, similar to what we currently do with the moduli screening options. We can also use this to skip the conversion regression tests in this case. OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe
-rw-r--r--ssh-keygen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0a020684..324c75cf 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.432 2021/07/23 03:37:52 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.433 2021/07/24 02:08:13 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3112,9 +3112,11 @@ usage(void)
" [-w provider] [-Z cipher]\n"
" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"
" [-P old_passphrase] [-Z cipher]\n"
+#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 -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");