diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ssh.c | 2 | ||||
| -rw-r--r-- | sshd.c | 4 | ||||
| -rw-r--r-- | version.h | 5 |
4 files changed, 10 insertions, 5 deletions
@@ -3,6 +3,8 @@ No change in resultant binary - (djm) [loginrec.c] __func__ifiy - (djm) [loginrec.c] xmalloc + - (djm) [ssh.c sshd.c version.h] Don't divulge portable version in protocol + banner. Suggested by deraadt@, ok mouring@, dtucker@ 20040911 - (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@ @@ -1740,4 +1742,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3550 2004/09/12 05:26:00 djm Exp $ +$Id: ChangeLog,v 1.3551 2004/09/12 06:53:04 djm Exp $ @@ -319,7 +319,7 @@ again: /* fallthrough */ case 'V': fprintf(stderr, "%s, %s\n", - SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); + SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); if (opt == 'V') exit(0); break; @@ -774,7 +774,7 @@ static void usage(void) { fprintf(stderr, "%s, %s\n", - SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); + SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); fprintf(stderr, "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" " [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n" @@ -1081,7 +1081,7 @@ main(int ac, char **av) exit(1); } - debug("sshd version %.100s", SSH_VERSION); + debug("sshd version %.100s", SSH_RELEASE); /* load private host keys */ sensitive_data.host_keys = xmalloc(options.num_host_key_files * @@ -1,3 +1,6 @@ /* $OpenBSD: version.h,v 1.42 2004/08/16 08:17:01 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.9p1" +#define SSH_VERSION "OpenSSH_3.9" + +#define SSH_PORTABLE "p1" +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |