nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 20:42:48 -05:00
Code Issues Projects Releases Wiki Activity

Server prep: pass "implementation name" to ssh_verstring_new.

Browse Source 
The word 'PuTTY' in the outgoing SSH version string has always
represented the name of the *SSH implementation* as opposed to the
name of the specific program containing it (for example, PSCP and
PSFTP don't announce themselves with a different banner). But I think
that a change from client to server merits a change in that
implementation name, so I'm removing the prefix "PuTTY" from the
constant string sshver[], and moving it to a parameter passed in
separately to ssh_verstring_new, so that the upcoming server can pass
in a different one.
This commit is contained in:
Simon Tatham
2018-10-21 09:29:17 +01:00
parent 8343961705
commit 650404f32c
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sshverstring.c
View File

@ -27,6 +27,7 @@ struct ssh_verstring_state {
int major_protoversion;
int remote_bugs;
char prefix[PREFIX_MAXLEN];
char *impl_name;
char *vstring;
int vslen, vstrsize;
char *protoversion;
@ -59,7 +60,8 @@ static int ssh_version_includes_v2(const char *ver);
BinaryPacketProtocol *ssh_verstring_new(
Conf *conf, LogContext *logctx, int bare_connection_mode,
const char *protoversion, struct ssh_version_receiver *rcv)
const char *protoversion, struct ssh_version_receiver *rcv,
const char *impl_name)
{
struct ssh_verstring_state *s = snew(struct ssh_verstring_state);
@ -90,6 +92,7 @@ BinaryPacketProtocol *ssh_verstring_new(
s->bpp.logctx = logctx;
s->our_protoversion = dupstr(protoversion);
s->receiver = rcv;
s->impl_name = dupstr(impl_name);
/*
* We send our version string early if we can. But if it includes
@ -108,6 +111,7 @@ void ssh_verstring_free(BinaryPacketProtocol *bpp)
struct ssh_verstring_state *s =
container_of(bpp, struct ssh_verstring_state, bpp);
conf_free(s->conf);
sfree(s->impl_name);
sfree(s->vstring);
sfree(s->protoversion);
sfree(s->our_vstring);
@ -155,9 +159,9 @@ static void ssh_verstring_send(struct ssh_verstring_state *s)
* Construct our outgoing version string.
*/
s->our_vstring = dupprintf(
"%.*s%s-%s",
"%.*s%s-%s%s",
(int)s->prefix_wanted.len, (const char *)s->prefix_wanted.ptr,
s->our_protoversion, sshver);
s->our_protoversion, s->impl_name, sshver);
sv_pos = s->prefix_wanted.len + strlen(s->our_protoversion) + 1;
/* Convert minus signs and spaces in the software version string