diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-07-30 00:01:34 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-30 12:32:16 +1000 |
| commit | f9eca249d4961f28ae4b09186d7dc91de74b5895 (patch) | |
| tree | f4c86ae2043499a6ed7f8c736f0cd5e1f483102c /kex.h | |
| parent | 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 (diff) | |
| download | openssh-git-f9eca249d4961f28ae4b09186d7dc91de74b5895.tar.gz | |
upstream commit
Allow ssh_config and sshd_config kex parameters options be
prefixed by a '+' to indicate that the specified items be appended to the
default rather than replacing it.
approach suggested by dtucker@, feedback dlg@, ok markus@
Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.72 2015/07/29 04:43:06 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.73 2015/07/30 00:01:34 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -160,6 +160,8 @@ 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_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **); int kex_setup(struct ssh *, char *[PROPOSAL_MAX]); |