summaryrefslogtreecommitdiffstats
path: root/kex.h
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2024-08-23 06:51:00 +0200
committerDamien Miller <djm@mindrot.org>2024-08-27 01:05:43 +0200
commit10ccf611ab8ecba9ce6b0548c5ccd8c1220baf92 (patch)
treece6dc0c5c4f0f624323c54a2b5b260e1c078a673 /kex.h
parentupstream: sntrup761x25519-sha512 now has an IANA codepoint assigned, so (diff)
downloadopenssh-10ccf611ab8ecba9ce6b0548c5ccd8c1220baf92.tar.xz
openssh-10ccf611ab8ecba9ce6b0548c5ccd8c1220baf92.zip
upstream: As defined in the RFC, the SSH protocol has negotiable
compression support (which is requested as the name "zlib"). Compression starts very early in the session. Relative early in OpenSSH lifetime, privsep was added to sshd, and this required a shared-memory hack so the two processes could see what was going on in the dataflow. This shared-memory hack was soon recognized as a tremendous complexity risk, because it put libz (which very much trusts it's memory) in a dangerous place, and a new option ("zlib@openssh.com") was added begins compression after authentication (aka delayed-compression). That change also permitted removal of the shared-memory hack. Despite removal from the server, the old "zlib" support remained in the client, to allow negotiation with non-OpenSSH daemons which lack the delayed-compression option. This commit deletes support for the older "zlib" option in the client. It reduces our featureset in a small way, and encourages other servers to move to a better design. The SSH protocol is different enough that compressed-key-material attacks like BEAST are unlikely, but who wants to take the chance? We encourage other ssh servers who care about optional compression support to add delayed-zlib support. (Some already do "zlib@openssh.com") ok djm markus OpenBSD-Commit-ID: 6df986f38e4ab389f795a6e39e7c6857a763ba72
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/kex.h b/kex.h
index 4b3ece669..670030213 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.124 2024/08/22 23:11:30 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.125 2024/08/23 04:51:00 deraadt Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -66,8 +66,6 @@
#define KEX_SNTRUP761X25519_SHA512_OLD "sntrup761x25519-sha512@openssh.com"
#define COMP_NONE 0
-/* pre-auth compression (COMP_ZLIB) is only supported in the client */
-#define COMP_ZLIB 1
#define COMP_DELAYED 2
#define CURVE25519_SIZE 32