Page MenuHomeFreeBSD
Files F136726629

D32930.id98317.diff
No OneTemporary
Actions

D32930.id98317.diff
View Options

Index: crypto/openssh/readconf.h
===================================================================
--- crypto/openssh/readconf.h
+++ crypto/openssh/readconf.h
@@ -1,5 +1,4 @@
/* $OpenBSD: readconf.h,v 1.144 2021/07/23 04:04:52 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -170,8 +169,6 @@
char *hostbased_accepted_algos;
char *pubkey_accepted_algos;
- char *version_addendum; /* Appended to SSH banner */
-
char *jump_user;
char *jump_host;
int jump_port;
Index: crypto/openssh/readconf.c
===================================================================
--- crypto/openssh/readconf.c
+++ crypto/openssh/readconf.c
@@ -68,7 +68,6 @@
#include "uidswap.h"
#include "myproposal.h"
#include "digest.h"
-#include "version.h"
/* Format of the configuration file:
@@ -143,7 +142,6 @@
typedef enum {
oBadOption,
- oVersionAddendum,
oHost, oMatch, oInclude,
oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,
oGatewayPorts, oExitOnForwardFailure,
@@ -330,7 +328,7 @@
{ "tcprcvbuf", oDeprecated },
{ "noneenabled", oUnsupported },
{ "noneswitch", oUnsupported },
- { "versionaddendum", oVersionAddendum },
+ { "versionaddendum", oDeprecated },
{ NULL, oBadOption }
};
@@ -1975,22 +1973,6 @@
intptr = &options->fork_after_authentication;
goto parse_flag;
- case oVersionAddendum:
- if (str == NULL)
- fatal("%.200s line %d: Missing argument.", filename,
- linenum);
- len = strspn(str, WHITESPACE);
- if (*activep && options->version_addendum == NULL) {
- if (strcasecmp(str + len, "none") == 0)
- options->version_addendum = xstrdup("");
- else if (strchr(str + len, '\r') != NULL)
- fatal("%.200s line %d: Invalid argument",
- filename, linenum);
- else
- options->version_addendum = xstrdup(str + len);
- }
- return 0;
-
case oIgnoreUnknown:
charptr = &options->ignored_unknown;
goto parse_string;
@@ -2318,7 +2300,6 @@
initialize_options(Options * options)
{
memset(options, 'X', sizeof(*options));
- options->version_addendum = NULL;
options->forward_agent = -1;
options->forward_agent_sock_path = NULL;
options->forward_x11 = -1;
@@ -2687,8 +2668,6 @@
/* options->hostname will be set in the main program if appropriate */
/* options->host_key_alias should not be set by default */
/* options->preferred_authentications will be set in ssh */
- if (options->version_addendum == NULL)
- options->version_addendum = xstrdup(SSH_VERSION_FREEBSD);
/* success */
ret = 0;
Index: crypto/openssh/ssh.1
===================================================================
--- crypto/openssh/ssh.1
+++ crypto/openssh/ssh.1
@@ -34,7 +34,6 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh.1,v 1.425 2021/07/28 05:57:42 jmc Exp $
-.\" $FreeBSD$
.Dd $Mdocdate: July 28 2021 $
.Dt SSH 1
.Os
@@ -576,7 +575,6 @@
.It User
.It UserKnownHostsFile
.It VerifyHostKeyDNS
-.It VersionAddendum
.It VisualHostKey
.It XAuthLocation
.El
Index: crypto/openssh/ssh.c
===================================================================
--- crypto/openssh/ssh.c
+++ crypto/openssh/ssh.c
@@ -872,14 +872,8 @@
}
break;
case 'V':
- if (options.version_addendum &&
- *options.version_addendum != '\0')
- fprintf(stderr, "%s %s, %s\n", SSH_RELEASE,
- options.version_addendum,
- OPENSSL_VERSION_STRING);
- else
- fprintf(stderr, "%s, %s\n", SSH_RELEASE,
- OPENSSL_VERSION_STRING);
+ fprintf(stderr, "%s, %s\n",
+ SSH_RELEASE, OPENSSL_VERSION_STRING);
if (opt == 'V')
exit(0);
break;
@@ -1146,7 +1140,6 @@
!use_syslog);
if (debug_flag)
- /* version_addendum is always NULL at this point */
logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING);
/* Parse the configuration files */
Index: crypto/openssh/ssh_config
===================================================================
--- crypto/openssh/ssh_config
+++ crypto/openssh/ssh_config
@@ -46,4 +46,3 @@
# RekeyLimit 1G 1h
# UserKnownHostsFile ~/.ssh/known_hosts.d/%k
# VerifyHostKeyDNS yes
-# VersionAddendum FreeBSD-20210907
Index: crypto/openssh/ssh_config.5
===================================================================
--- crypto/openssh/ssh_config.5
+++ crypto/openssh/ssh_config.5
@@ -1965,14 +1965,6 @@
.Sx VERIFYING HOST KEYS
in
.Xr ssh 1 .
-.It Cm VersionAddendum
-Specifies a string to append to the regular version string to identify
-OS- or site-specific modifications.
-The default is
-.Dq FreeBSD-20210907 .
-The value
-.Cm none
-may be used to disable this.
.It Cm VisualHostKey
If this flag is set to
.Cm yes ,
Index: crypto/openssh/sshconnect.c
===================================================================
--- crypto/openssh/sshconnect.c
+++ crypto/openssh/sshconnect.c
@@ -14,7 +14,6 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
#include <sys/types.h>
#include <sys/wait.h>
@@ -1554,8 +1553,7 @@
lowercase(host);
/* Exchange protocol version identification strings with the server. */
- if ((r = kex_exchange_identification(ssh, timeout_ms,
- options.version_addendum)) != 0)
+ if ((r = kex_exchange_identification(ssh, timeout_ms, NULL)) != 0)
sshpkt_fatal(ssh, r, "banner exchange");
/* Put the connection into non-blocking mode. */

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 20, 2:08 AM (9 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25702864
Default Alt Text
D32930.id98317.diff (5 KB)

Event Timeline