diff options
| author |   markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
| commit | 1249177580e91cb4476836a604cfbb1fd56d87ec (patch) | |
| tree | 2c4439e34f8788b6b9ae0b0faf20fd17685253be /usr.bin/ssh/auth.c | |
| parent | a bit more merge for traceroute6 stuff, and some consistency fixes; (diff) | |
| download | wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.tar.xz wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.zip | |
make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index 70fc44f26de..72b88c207da 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.103 2013/05/19 02:42:42 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.104 2014/04/29 18:01:49 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -533,6 +533,7 @@ getpwnamallow(const char *user) int auth_key_is_revoked(Key *key) { +#ifdef WITH_OPENSSL char *key_fp; if (options.revoked_keys_file == NULL) @@ -545,6 +546,7 @@ auth_key_is_revoked(Key *key) default: goto revoked; } +#endif debug3("%s: treating %s as a key list", __func__, options.revoked_keys_file); switch (key_in_file(key, options.revoked_keys_file, 0)) { @@ -556,6 +558,7 @@ auth_key_is_revoked(Key *key) error("Revoked keys file is unreadable: refusing public key " "authentication"); return 1; +#ifdef WITH_OPENSSL case 1: revoked: /* Key revoked */ @@ -564,6 +567,7 @@ auth_key_is_revoked(Key *key) "%s key %s ", key_type(key), key_fp); free(key_fp); return 1; +#endif } fatal("key_in_file returned junk"); } |