upstream: key conversion should fail for !openssl builds, not fall

through to the key generation code

OpenBSD-Commit-ID: b957436adc43c4941e61d61958a193a708bc83c9
This commit is contained in:
djm@openbsd.org 2019-09-06 07:53:40 +00:00 committed by Damien Miller
parent 823f6c37eb
commit c8bdd2db77

View File

@ -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
@ -3108,7 +3108,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) {