diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-04 15:49:31 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-04 15:51:52 +0200 |
| commit | 312d2f2861a2598ed08587cb6c45c0e98a85408f (patch) | |
| tree | e3bdc4facef48a89cd76fa793d9e70211b7ff8d2 /kex.h | |
| parent | upstream: some magic for RSA-SHA2 checks (diff) | |
| download | openssh-312d2f2861a2598ed08587cb6c45c0e98a85408f.tar.xz openssh-312d2f2861a2598ed08587cb6c45c0e98a85408f.zip | |
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 'kex.h')
| -rw-r--r-- | kex.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.84 2018/07/03 11:39:54 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.85 2018/07/04 13:49:31 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -169,7 +169,7 @@ struct kex { int kex_names_valid(const char *); char *kex_alg_list(char); char *kex_names_cat(const char *, const char *); -int kex_assemble_names(const char *, char **); +int kex_assemble_names(char **, const char *, const char *); int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **); int kex_setup(struct ssh *, char *[PROPOSAL_MAX]); |