diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-12-06 22:58:16 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-12-06 22:58:16 +0000 |
| commit | da29e0996382143bbe6106889c26011e28bf1844 (patch) | |
| tree | 80f47bd28accbbed328d3a8d58f096697558745b /usr.bin | |
| parent | 486eecba2e2f7a17e65a41c8eb8508eb9a35ce7a (diff) | |
disable debug messages for ssh.com/f-secure 2.0.1x, 2.1.0
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/compat.c | 11 | ||||
| -rw-r--r-- | usr.bin/ssh/compat.h | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/packet.c | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c index 5500b6f3428..65495764edc 100644 --- a/usr.bin/ssh/compat.c +++ b/usr.bin/ssh/compat.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: compat.c,v 1.30 2000/12/03 11:29:04 markus Exp $"); +RCSID("$OpenBSD: compat.c,v 1.31 2000/12/06 22:58:14 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -61,13 +61,14 @@ compat_datafellows(const char *version) { "^OpenSSH[-_]2\\.[012]", SSH_OLD_SESSIONID }, { "MindTerm", 0 }, { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| - SSH_OLD_SESSIONID }, + SSH_OLD_SESSIONID|SSH_BUG_DEBUG }, { "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| - SSH_OLD_SESSIONID| + SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD }, { "^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| - SSH_OLD_SESSIONID|SSH_BUG_PKAUTH| - SSH_BUG_PKSERVICE|SSH_BUG_X11FWD }, + SSH_OLD_SESSIONID|SSH_BUG_DEBUG| + SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| + SSH_BUG_PKAUTH }, { "^2\\.[23]\\.0", SSH_BUG_HMAC}, { "^2\\.[2-9]\\.", 0 }, { "^2\\.4$", SSH_OLD_SESSIONID}, /* Van Dyke */ diff --git a/usr.bin/ssh/compat.h b/usr.bin/ssh/compat.h index 86e471506fa..cf97c7d2807 100644 --- a/usr.bin/ssh/compat.h +++ b/usr.bin/ssh/compat.h @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: compat.h,v 1.12 2000/12/03 11:15:03 markus Exp $"); */ +/* RCSID("$OpenBSD: compat.h,v 1.13 2000/12/06 22:58:15 markus Exp $"); */ #ifndef COMPAT_H #define COMPAT_H @@ -37,6 +37,7 @@ #define SSH_BUG_X11FWD 0x08 #define SSH_OLD_SESSIONID 0x10 #define SSH_BUG_PKAUTH 0x20 +#define SSH_BUG_DEBUG 0x40 void enable_compat13(void); void enable_compat20(void); diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 3216fdaf45e..9416509005d 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: packet.c,v 1.38 2000/10/12 14:21:12 markus Exp $"); +RCSID("$OpenBSD: packet.c,v 1.39 2000/12/06 22:58:15 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -1101,6 +1101,9 @@ packet_send_debug(const char *fmt,...) char buf[1024]; va_list args; + if (compat20 && (datafellows & SSH_BUG_DEBUG)) + return; + va_start(args, fmt); vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); |