summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--compat.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6da3753d3..541db38c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -126,6 +126,10 @@
126 [misc.c misc.h umac.c] 126 [misc.c misc.h umac.c]
127 use get/put_u32 to load values rather than *((UINT32 *)p) that breaks on 127 use get/put_u32 to load values rather than *((UINT32 *)p) that breaks on
128 strict-alignment architectures; reported by and ok stsp@ 128 strict-alignment architectures; reported by and ok stsp@
129 - djm@cvs.openbsd.org 2014/04/20 02:49:32
130 [compat.c]
131 add a canonical 6.6 + curve25519 bignum fix fake version that I can
132 recommend people use ahead of the openssh-6.7 release
129 133
13020140401 13420140401
131 - (djm) On platforms that support it, use prctl() to prevent sftp-server 135 - (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/compat.c b/compat.c
index 12a7d5de7..4d286e8e9 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.84 2014/04/19 05:54:59 djm Exp $ */ 1/* $OpenBSD: compat.c,v 1.85 2014/04/20 02:49:32 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -95,6 +95,7 @@ compat_datafellows(const char *version)
95 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 95 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
96 { "OpenSSH_4*", 0 }, 96 { "OpenSSH_4*", 0 },
97 { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, 97 { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
98 { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH},
98 { "OpenSSH_6.5*," 99 { "OpenSSH_6.5*,"
99 "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, 100 "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD},
100 { "OpenSSH*", SSH_NEW_OPENSSH }, 101 { "OpenSSH*", SSH_NEW_OPENSSH },