diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-07-24 04:51:14 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-07-24 06:22:26 +0200 |
| commit | f5ccb5895d39cd627ad9e7b2c671d2587616100d (patch) | |
| tree | eec345ea5f04aa821594e9c55d81b3826cea6d3a /ssh-keygen.c | |
| parent | upstream: Exclude key conversion options from usage when built (diff) | |
| download | openssh-f5ccb5895d39cd627ad9e7b2c671d2587616100d.tar.xz openssh-f5ccb5895d39cd627ad9e7b2c671d2587616100d.zip | |
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
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |