summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-21 11:06:09 +0000
committerDamien Miller <djm@mindrot.org>2020-01-21 22:10:28 +1100
commit80d3bebcab96fe1d177e45906e10db16895da01d (patch)
tree4533a0ac3eb346156862e40195b008b8ba6559fe /ssh-keygen.c
parentf8c11461aa6db168fc5e7eeae448b4cbbf59642a (diff)
upstream: don't #ifdef out the KRL code when compiling without
libcrypto support; it works just fine and disabling it breaks a few tests. ok dtucker@ OpenBSD-Commit-ID: 65f6272c4241eb4b04de78b012fe98b2b555ad44
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6b497da1..ecfea8c2 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -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)