diff options
| author |   djm <djm@openbsd.org> | 2015-03-18 01:44:21 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-03-18 01:44:21 +0000 |
| commit | b6a756d5e4de2dcd6199b0ba79c9b9fc6efbaa06 (patch) | |
| tree | bf1a0d1da02f43ca6c24a9947c2bb7f83e6b8cfd | |
| parent | "handle" wccp2 packets if net.inet.gre.wccp is set to 2 by truncating (diff) | |
| download | wireguard-openbsd-b6a756d5e4de2dcd6199b0ba79c9b9fc6efbaa06.tar.xz wireguard-openbsd-b6a756d5e4de2dcd6199b0ba79c9b9fc6efbaa06.zip | |
KRL support doesn't need OpenSSL anymore, remove #ifdefs
from around call
| -rw-r--r-- | usr.bin/ssh/authfile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index daae4776b89..cad372d516b 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.111 2015/02/23 16:55:51 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.112 2015/03/18 01:44:21 djm Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -549,12 +549,10 @@ sshkey_check_revoked(struct sshkey *key, const char *revoked_keys_file) { int r; -#ifdef WITH_OPENSSL r = ssh_krl_file_contains_key(revoked_keys_file, key); /* If this was not a KRL to begin with then continue below */ if (r != SSH_ERR_KRL_BAD_MAGIC) return r; -#endif /* * If the file is not a KRL or we can't handle KRLs then attempt to |