diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-04 13:49:31 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-04 23:51:52 +1000 |
| commit | 312d2f2861a2598ed08587cb6c45c0e98a85408f (patch) | |
| tree | e3bdc4facef48a89cd76fa793d9e70211b7ff8d2 /match.h | |
| parent | 303af5803bd74bf05d375c04e1a83b40c30b2be5 (diff) | |
| download | openssh-git-312d2f2861a2598ed08587cb6c45c0e98a85408f.tar.gz | |
upstream: repair PubkeyAcceptedKeyTypes (and friends) after RSA
signature work - returns ability to add/remove/specify algorithms by
wildcard.
Algorithm lists are now fully expanded when the server/client configs
are finalised, so errors are reported early and the config dumps
(e.g. "ssh -G ...") now list the actual algorithms selected.
Clarify that, while wildcards are accepted in algorithm lists, they
aren't full pattern-lists that support negation.
(lots of) feedback, ok markus@
OpenBSD-Commit-ID: a8894c5c81f399a002f02ff4fe6b4fa46b1f3207
Diffstat (limited to 'match.h')
| -rw-r--r-- | match.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: match.h,v 1.17 2017/02/03 23:01:19 djm Exp $ */ +/* $OpenBSD: match.h,v 1.18 2018/07/04 13:49:31 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -20,7 +20,8 @@ int match_hostname(const char *, const char *); int match_host_and_ip(const char *, const char *, const char *); int match_user(const char *, const char *, const char *, const char *); char *match_list(const char *, const char *, u_int *); -char *match_filter_list(const char *, const char *); +char *match_filter_blacklist(const char *, const char *); +char *match_filter_whitelist(const char *, const char *); /* addrmatch.c */ int addr_match_list(const char *, const char *); |