- (djm) [ssh.c sshd.c version.h] Don't divulge portable version in protocol

   banner. Suggested by deraadt@, ok mouring@, dtucker@

diff --git a/ChangeLog b/ChangeLog
index 3a9d8f6258fc934d7676d016f3bb8e5d6d21ec07..37651b2f228d76832b278e0899a7ece869b1b922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@

diff --git a/ssh.c b/ssh.c
index e69d738077dbfa9634cd515980cf69249e35d95c..6f0ba26ad0b0ba3fe925714dd202e51d45c032f0 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -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;

diff --git a/sshd.c b/sshd.c
index 2a28ece035ca2d3a2038a683929b21c00b790df7..4b2d10af9e67e8784d34ad51689d839be647352c 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -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 *

diff --git a/version.h b/version.h
index aae2c3b37f7dd5f4743f4cedf52c8245a4449d9e..d0c867b87951f3c67dbf0b3d919568e8845cf56c 100644 (file)
--- a/version.h
+++ b/version.h
@@ -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