summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index ba409b9d278..c8dde084f71 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.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
@@ -2145,7 +2145,6 @@ do_show_cert(struct passwd *pw)
exit(ok ? 0 : 1);
}
-#ifdef WITH_OPENSSL
static void
load_krl(const char *path, struct ssh_krl **krlp)
{
@@ -2440,7 +2439,6 @@ do_check_krl(struct passwd *pw, int argc, char **argv)
ssh_krl_free(krl);
exit(ret);
}
-#endif
static struct sshkey *
load_sign_key(const char *keypath, const struct sshkey *pubkey)
@@ -3344,21 +3342,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)