diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-23 03:46:49 +0100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-23 04:40:15 +0100 |
commit | c4b3a128954ee1b7fbcbda167baf8aca1a3d1c84 (patch) | |
tree | 60dca3a18ff7ec4bc2f6b9d90f8abb867344fcc9 /readconf.h | |
parent | upstream: add a new signature operations "find-principal" to look (diff) | |
download | openssh-c4b3a128954ee1b7fbcbda167baf8aca1a3d1c84.tar.xz openssh-c4b3a128954ee1b7fbcbda167baf8aca1a3d1c84.zip |
upstream: Remove unsupported algorithms from list of defaults at run
time and remove ifdef and distinct settings for OPENSSL=no case.
This will make things much simpler for -portable where the exact set
of algos depends on the configuration of both OpenSSH and the libcrypto
it's linked against (if any). ok djm@
OpenBSD-Commit-ID: e0116d0183dcafc7a9c40ba5fe9127805c5dfdd2
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index dcecfc54a..feedb3d20 100644 --- a/readconf.h +++ b/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.131 2019/12/21 02:19:13 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.132 2020/01/23 02:46:49 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -199,6 +199,7 @@ typedef struct { #define SSH_STRICT_HOSTKEY_YES 2 #define SSH_STRICT_HOSTKEY_ASK 3 +const char *kex_default_pk_alg(void); void initialize_options(Options *); void fill_default_options(Options *); void fill_default_options_for_canonicalization(Options *); |