Exclude key conversion options from usage when built without OpenSSL
authordtucker <dtucker@openbsd.org>
Sat, 24 Jul 2021 02:08:13 +0000 (02:08 +0000)
committerdtucker <dtucker@openbsd.org>
Sat, 24 Jul 2021 02:08:13 +0000 (02:08 +0000)
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.

usr.bin/ssh/ssh-keygen.c

index dc70fb0..0f8bfec 100644 (file)
@@ -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
@@ -3089,9 +3089,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");