diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-07-03 11:42:12 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-03 23:26:47 +1000 |
commit | 2f30300c5e15929d0e34013f38d73e857f445e12 (patch) | |
tree | 5ec1533bcf1f445a92a56c23c494839e6b1c5ee3 | |
parent | 4ba0d54794814ec0de1ec87987d0c3b89379b436 (diff) |
upstream: crank version number to 7.8; needed for new compat flag
for prior version; part of RSA-SHA2 strictification, ok markus@
OpenBSD-Commit-ID: 84a11fc0efd2674c050712336b5093f5d408e32b
-rw-r--r-- | compat.c | 5 | ||||
-rw-r--r-- | version.h | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: compat.c,v 1.108 2018/07/03 11:39:54 djm Exp $ */ | 1 | /* $OpenBSD: compat.c,v 1.109 2018/07/03 11:42:12 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 | * |
@@ -72,7 +72,8 @@ compat_datafellows(const char *version) | |||
72 | "OpenSSH_7.3*," | 72 | "OpenSSH_7.3*," |
73 | "OpenSSH_7.4*," | 73 | "OpenSSH_7.4*," |
74 | "OpenSSH_7.5*," | 74 | "OpenSSH_7.5*," |
75 | "OpenSSH_7.6*", SSH_NEW_OPENSSH|SSH_BUG_SIGTYPE}, | 75 | "OpenSSH_7.6*," |
76 | "OpenSSH_7.7*", SSH_NEW_OPENSSH|SSH_BUG_SIGTYPE}, | ||
76 | { "OpenSSH*", SSH_NEW_OPENSSH }, | 77 | { "OpenSSH*", SSH_NEW_OPENSSH }, |
77 | { "*MindTerm*", 0 }, | 78 | { "*MindTerm*", 0 }, |
78 | { "3.0.*", SSH_BUG_DEBUG }, | 79 | { "3.0.*", SSH_BUG_DEBUG }, |
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: version.h,v 1.81 2018/03/24 19:29:03 markus Exp $ */ | 1 | /* $OpenBSD: version.h,v 1.82 2018/07/03 11:42:12 djm Exp $ */ |
2 | 2 | ||
3 | #define SSH_VERSION "OpenSSH_7.7" | 3 | #define SSH_VERSION "OpenSSH_7.8" |
4 | 4 | ||
5 | #define SSH_PORTABLE "p1" | 5 | #define SSH_PORTABLE "p1" |
6 | #define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 6 | #define SSH_RELEASE SSH_VERSION SSH_PORTABLE |