- OpenBSD CVS Sync:

   - reinhard@cvs.openbsd.org        2001/02/17 08:24:40
     [sftp.1]
     typo
   - deraadt@cvs.openbsd.org 2001/02/17 16:28:58
     [ssh.c]
     cleanup -V output; noted by millert
   - deraadt@cvs.openbsd.org 2001/02/17 16:48:48
     [sshd.8]
     it's the OpenSSH one
   - markus@cvs.openbsd.org  2001/02/18 11:33:54
     [dispatch.c]
     typo, SSH2_MSG_KEXINIT, from aspa@kronodoc.fi
   - markus@cvs.openbsd.org  2001/02/19 02:53:32
     [compat.c compat.h serverloop.c]
     ssh-1.2.{18-22} has broken handling of ignore messages; report from
     itojun@
   - markus@cvs.openbsd.org  2001/02/19 03:35:23
     [version.h]
     OpenSSH_2.5.1 adds bug compat with 1.2.{18-22}
   - deraadt@cvs.openbsd.org 2001/02/19 03:36:25
     [scp.c]
     np is changed by recursion; vinschen@redhat.com

1 files changed, 5 insertions, 4 deletions

diff --git a/ssh.c b/ssh.c
index 1b022402d..9e5ca116f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.95 2001/02/11 12:59:25 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.96 2001/02/17 23:28:58 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -391,11 +391,12 @@ main(int ac, char **av)
                         }
                         /* fallthrough */
                 case 'V':
-                        fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n",
+                        fprintf(stderr,
+                            "%s, SSH protocols %d.%d/%d.%d, OpenSSL 0x%8.8lx\n",
                             SSH_VERSION,
                             PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
-                            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2);
-                        fprintf(stderr, "Compiled with SSL (0x%8.8lx).\n", SSLeay());
+                            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
+                            SSLeay());
                         if (opt == 'V')
                                 exit(0);
                         break;