diff options
| author | des <des@FreeBSD.org> | 2016-03-12 23:53:20 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-12 23:53:20 +0000 |
| commit | 629436fac8d85a5c231a09fdc142b64f3d6b0de4 (patch) | |
| tree | 1d80569f877f044481a89257a41345cacf910c22 /crypto/openssh/sshconnect.h | |
| parent | 976f44ffb6fcd46b126d64871bc40d47ed7a3814 (diff) | |
| download | FreeBSD-src-629436fac8d85a5c231a09fdc142b64f3d6b0de4.zip FreeBSD-src-629436fac8d85a5c231a09fdc142b64f3d6b0de4.tar.gz | |
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Diffstat (limited to 'crypto/openssh/sshconnect.h')
| -rw-r--r-- | crypto/openssh/sshconnect.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/sshconnect.h b/crypto/openssh/sshconnect.h index 0ea6e99..cf1851a 100644 --- a/crypto/openssh/sshconnect.h +++ b/crypto/openssh/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.28 2013/10/16 02:31:47 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.29 2015/11/15 22:26:49 jcs Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -55,6 +55,8 @@ void ssh_userauth2(const char *, const char *, char *, Sensitive *); void ssh_put_password(char *); int ssh_local_cmd(const char *); +void maybe_add_key_to_agent(char *, Key *, char *, char *); + /* * Macros to raise/lower permissions. */ |
