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 6b497da10..ecfea8c20 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.383 2020/01/14 15:07:30 naddy Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.384 2020/01/21 11:06:09 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3365,21 +3365,13 @@ main(int argc, char **argv)
3365 usage(); 3365 usage();
3366 } 3366 }
3367 if (gen_krl) { 3367 if (gen_krl) {
3368#ifdef WITH_OPENSSL
3369 do_gen_krl(pw, update_krl, ca_key_path, 3368 do_gen_krl(pw, update_krl, ca_key_path,
3370 cert_serial, identity_comment, argc, argv); 3369 cert_serial, identity_comment, argc, argv);
3371 return (0); 3370 return (0);
3372#else
3373 fatal("KRL generation not supported");
3374#endif
3375 } 3371 }
3376 if (check_krl) { 3372 if (check_krl) {
3377#ifdef WITH_OPENSSL
3378 do_check_krl(pw, argc, argv); 3373 do_check_krl(pw, argc, argv);
3379 return (0); 3374 return (0);
3380#else
3381 fatal("KRL checking not supported");
3382#endif
3383 } 3375 }
3384 if (ca_key_path != NULL) { 3376 if (ca_key_path != NULL) {
3385 if (cert_key_id == NULL) 3377 if (cert_key_id == NULL)