From 6163350eb97774e7f780d5cc9df6164a6803aa0c Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 12 Feb 2006 16:48:56 +1100 Subject: - (dtucker) [README version.h contrib/caldera/openssh.spec contrib/redhat/openssh.spec contrib/suse/openssh.spec] Bump version strings to match 4.3p2 release. --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'version.h') diff --git a/version.h b/version.h index 2b729524e..d5fd0c6ce 100644 --- a/version.h +++ b/version.h @@ -2,5 +2,5 @@ #define SSH_VERSION "OpenSSH_4.3" -#define SSH_PORTABLE "p1" +#define SSH_PORTABLE "p2" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -- cgit v1.2.3 From 6ba57409417431f26ad960ed717880d04273c714 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 30 Aug 2006 11:09:01 +1000 Subject: - djm@cvs.openbsd.org 2006/08/30 00:14:37 [version.h] crank to 4.4 --- ChangeLog | 5 ++++- version.h | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index ab40e629b..ae8db7fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,9 @@ [sshconnect2.c] Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL where previously it weren't. bz #1221, found by Dean Kopesky, ok djm@ + - djm@cvs.openbsd.org 2006/08/30 00:14:37 + [version.h] + crank to 4.4 20060824 - (dtucker) [openbsd-compat/basename.c] Include errno.h. @@ -5325,4 +5328,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4515 2006/08/30 01:08:33 djm Exp $ +$Id: ChangeLog,v 1.4516 2006/08/30 01:09:01 djm Exp $ diff --git a/version.h b/version.h index d5fd0c6ce..363e510ba 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ -/* $OpenBSD: version.h,v 1.46 2006/02/01 11:27:22 markus Exp $ */ +/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */ -#define SSH_VERSION "OpenSSH_4.3" +#define SSH_VERSION "OpenSSH_4.4" -#define SSH_PORTABLE "p2" +#define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -- cgit v1.2.3 From fbba735aa315532e93a66754b1613c2acf2bde6d Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 7 Nov 2006 23:16:08 +1100 Subject: - markus@cvs.openbsd.org 2006/11/07 10:31:31 [monitor.c version.h] correctly check for bad signatures in the monitor, otherwise the monitor and the unpriv process can get out of sync. with dtucker@, ok djm@, dtucker@ --- ChangeLog | 7 ++++++- monitor.c | 8 ++++---- version.h | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index 8af3cf900..075ba5359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c] add missing checks for openssl return codes; with & ok djm@ + - markus@cvs.openbsd.org 2006/11/07 10:31:31 + [monitor.c version.h] + correctly check for bad signatures in the monitor, otherwise the monitor + and the unpriv process can get out of sync. with dtucker@, ok djm@, + dtucker@ 20061105 - (djm) OpenBSD CVS Sync @@ -2597,4 +2602,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4585 2006/11/07 12:14:41 dtucker Exp $ +$Id: ChangeLog,v 1.4586 2006/11/07 12:16:08 dtucker Exp $ diff --git a/monitor.c b/monitor.c index b20d0c726..48ae46ccc 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */ +/* $OpenBSD: monitor.c,v 1.89 2006/11/07 10:31:31 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -350,7 +350,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) /* The first few requests do not require asynchronous access */ while (!authenticated) { auth_method = "unknown"; - authenticated = monitor_read(pmonitor, mon_dispatch, &ent); + authenticated = (monitor_read(pmonitor, mon_dispatch, &ent) == 1); if (authenticated) { if (!(ent->flags & MON_AUTHDECIDE)) fatal("%s: unexpected authentication from %d", @@ -1217,7 +1217,7 @@ mm_answer_keyverify(int sock, Buffer *m) verified = key_verify(key, signature, signaturelen, data, datalen); debug3("%s: key %p signature %s", - __func__, key, verified ? "verified" : "unverified"); + __func__, key, (verified == 1) ? "verified" : "unverified"); key_free(key); xfree(blob); @@ -1232,7 +1232,7 @@ mm_answer_keyverify(int sock, Buffer *m) buffer_put_int(m, verified); mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); - return (verified); + return (verified == 1); } static void diff --git a/version.h b/version.h index 363e510ba..d16990a21 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ -/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */ +/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */ -#define SSH_VERSION "OpenSSH_4.4" +#define SSH_VERSION "OpenSSH_4.5" #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -- cgit v1.2.3 From 2dbab87386ba6816466475fc5308a79199543ebb Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 6 Mar 2007 21:21:37 +1100 Subject: - djm@cvs.openbsd.org 2007/03/06 10:13:14 [version.h] openssh-4.6; "please" deraadt@ --- ChangeLog | 5 ++++- version.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index 0fec02c7b..c74a826f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ - jmc@cvs.openbsd.org 2007/03/01 16:19:33 [sshd_config.5] sort the `match' keywords; + - djm@cvs.openbsd.org 2007/03/06 10:13:14 + [version.h] + openssh-4.6; "please" deraadt@ 20070304 - (djm) [configure.ac] add a --without-openssl-header-check option to @@ -2809,4 +2812,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4632 2007/03/06 10:21:18 djm Exp $ +$Id: ChangeLog,v 1.4633 2007/03/06 10:21:37 djm Exp $ diff --git a/version.h b/version.h index d16990a21..0f4811120 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ -/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */ +/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */ -#define SSH_VERSION "OpenSSH_4.5" +#define SSH_VERSION "OpenSSH_4.6" #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -- cgit v1.2.3