- dtucker@cvs.openbsd.org 2012/06/28 05:07:45

[mac.c myproposal.h ssh_config.5 sshd_config.5] Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed from draft6 of the spec and will not be in the RFC when published. Patch from mdb at juniper net via bz#2023, ok markus.
author: Damien Miller <djm@mindrot.org> 2012-06-30 08:34:59 +1000
committer: Damien Miller <djm@mindrot.org> 2012-06-30 08:34:59 +1000
commit: db4f8e86184ef0e8d14a370a5569a52d8ed28551 (patch)
tree: c2664c0607fa20ba11bf3d1f9ce2a1069abd78b2 /ssh_config.5
parent: 560de922b18fe7fcea8cc837d87cd4609738eb0f (diff)
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index c9917d25b..db7ea5cdd 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.155 2012/06/18 11:49:58 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.156 2012/06/28 05:07:45 dtucker Exp $
-.Dd $Mdocdate: June 18 2012 $
+.Dd $Mdocdate: June 28 2012 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -794,8 +794,7 @@ The default is:
 .Bd -literal -offset indent
 hmac-md5,hmac-sha1,umac-64@openssh.com,
 hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
-hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,
+hmac-sha2-256,hmac-sha2-512
-hmac-sha2-512-96
 .Ed
 .It Cm NoHostAuthenticationForLocalhost
 This option can be used if the home directory is shared across machines.
author	Damien Miller <djm@mindrot.org>	2012-06-30 08:34:59 +1000
committer	Damien Miller <djm@mindrot.org>	2012-06-30 08:34:59 +1000
commit	db4f8e86184ef0e8d14a370a5569a52d8ed28551 (patch)
tree	c2664c0607fa20ba11bf3d1f9ce2a1069abd78b2 /ssh_config.5
parent	560de922b18fe7fcea8cc837d87cd4609738eb0f (diff)

diff --git a/ssh_config.5 b/ssh_config.5 index c9917d25b..db7ea5cdd 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh_config.5,v 1.155 2012/06/18 11:49:58 dtucker Exp $	36	.\" $OpenBSD: ssh_config.5,v 1.156 2012/06/28 05:07:45 dtucker Exp $
37	.Dd $Mdocdate: June 18 2012 $	37	.Dd $Mdocdate: June 28 2012 $
38	.Dt SSH_CONFIG 5	38	.Dt SSH_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -794,8 +794,7 @@ The default is:
794	.Bd -literal -offset indent	794	.Bd -literal -offset indent
795	hmac-md5,hmac-sha1,umac-64@openssh.com,	795	hmac-md5,hmac-sha1,umac-64@openssh.com,
796	hmac-ripemd160,hmac-sha1-96,hmac-md5-96,	796	hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
797	hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,	797	hmac-sha2-256,hmac-sha2-512
798	hmac-sha2-512-96
799	.Ed	798	.Ed
800	.It Cm NoHostAuthenticationForLocalhost	799	.It Cm NoHostAuthenticationForLocalhost
801	This option can be used if the home directory is shared across machines.	800	This option can be used if the home directory is shared across machines.