]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: don't #ifdef out the KRL code when compiling without
authordjm@openbsd.org <djm@openbsd.org>
Tue, 21 Jan 2020 11:06:09 +0000 (11:06 +0000)
committerDamien Miller <djm@mindrot.org>
Tue, 21 Jan 2020 11:10:28 +0000 (22:10 +1100)
libcrypto support; it works just fine and disabling it breaks a few tests. ok
dtucker@

OpenBSD-Commit-ID: 65f6272c4241eb4b04de78b012fe98b2b555ad44

ssh-keygen.c

index 6b497da108c60a6960d10e9f4284a39e6b7a075d..ecfea8c20ad13a838964b453487682caa8095f88 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.383 2020/01/14 15:07:30 naddy Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.384 2020/01/21 11:06:09 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3365,21 +3365,13 @@ main(int argc, char **argv)
                usage();
        }
        if (gen_krl) {
-#ifdef WITH_OPENSSL
                do_gen_krl(pw, update_krl, ca_key_path,
                    cert_serial, identity_comment, argc, argv);
                return (0);
-#else
-               fatal("KRL generation not supported");
-#endif
        }
        if (check_krl) {
-#ifdef WITH_OPENSSL
                do_check_krl(pw, argc, argv);
                return (0);
-#else
-               fatal("KRL checking not supported");
-#endif
        }
        if (ca_key_path != NULL) {
                if (cert_key_id == NULL)