diff options
| author |   djm <djm@openbsd.org> | 2019-09-06 07:53:40 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-06 07:53:40 +0000 |
| commit | 8c12efa958041167bb5adbe358a9ddd8b4c54c4f (patch) | |
| tree | 24fa8f1cf4c4dc5328af3bf3726d371f25b981c9 | |
| parent | zero hash bits early in dwxe_iff() (diff) | |
| download | wireguard-openbsd-8c12efa958041167bb5adbe358a9ddd8b4c54c4f.tar.xz wireguard-openbsd-8c12efa958041167bb5adbe358a9ddd8b4c54c4f.zip | |
key conversion should fail for !openssl builds, not fall through to
the key generation code
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 6880e72918a..0d8868e514c 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.348 2019/09/06 05:23:55 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.349 2019/09/06 07:53:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3092,7 +3092,10 @@ main(int argc, char **argv) do_convert_to(pw); if (convert_from) do_convert_from(pw); -#endif +#else /* WITH_OPENSSL */ + if (convert_to || convert_from) + fatal("key conversion disabled at compile time"); +#endif /* WITH_OPENSSL */ if (print_public) do_print_public(pw); if (rr_hostname != NULL) { |