diff options
| author | jsg@openbsd.org <jsg@openbsd.org> | 2024-09-26 01:01:39 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-09-27 02:01:11 +0200 |
| commit | 220b6c1290042acd5180d783dea01efe1365c265 (patch) | |
| tree | b329cbaeb14ebf4c3785f8cae7f51766648be10b | |
| parent | upstream: remove some unneeded Xo/Xc calls; from evan silberman the (diff) | |
| download | openssh-220b6c1290042acd5180d783dea01efe1365c265.tar.xz openssh-220b6c1290042acd5180d783dea01efe1365c265.zip | |
upstream: remove some unused defines; ok djm@
OpenBSD-Commit-ID: 3a63e4e11d455704f684c28715d61b17f91e0996
| -rw-r--r-- | readconf.h | 3 | ||||
| -rw-r--r-- | ssh.h | 17 |
2 files changed, 4 insertions, 16 deletions
diff --git a/readconf.h b/readconf.h index 9447d5d6e..a1e43852c 100644 --- a/readconf.h +++ b/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.156 2024/03/04 02:16:11 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.157 2024/09/25 23:01:39 jsg Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -19,7 +19,6 @@ /* Data structure for representing option data. */ #define SSH_MAX_HOSTS_FILES 32 -#define MAX_CANON_DOMAINS 32 #define PATH_MAX_SUN (sizeof((struct sockaddr_un *)0)->sun_path) struct allowed_cname { @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.h,v 1.90 2020/07/14 23:57:01 djm Exp $ */ +/* $OpenBSD: ssh.h,v 1.91 2024/09/25 23:01:39 jsg Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -12,9 +12,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* Cipher used for encrypting authentication files. */ -#define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES - /* Default port number. */ #define SSH_DEFAULT_PORT 22 @@ -36,11 +33,9 @@ * * Minor protocol version. Different version indicates minor incompatibility * that does not prevent interoperation. + * + * We support only SSH2 */ -#define PROTOCOL_MAJOR_1 1 -#define PROTOCOL_MINOR_1 5 - -/* We support only SSH2 */ #define PROTOCOL_MAJOR_2 2 #define PROTOCOL_MINOR_2 0 @@ -73,12 +68,6 @@ #define SSH_ASKPASS_REQUIRE_ENV "SSH_ASKPASS_REQUIRE" /* - * Force host key length and server key length to differ by at least this - * many bits. This is to make double encryption with rsaref work. - */ -#define SSH_KEY_BITS_RESERVED 128 - -/* * Length of the session key in bytes. (Specified as 256 bits in the * protocol.) */ |