- (djm) OpenBSD CVS Sync

- djm@cvs.openbsd.org 2003/05/15 13:52:10
     [ssh.c]
     Make "ssh -V" print the OpenSSL version in a human readable form. Patch
     from Craig Leres (mindrot at ee.lbl.gov); ok markus@
This commit is contained in:
Damien Miller 2003-05-16 11:38:00 +10:00
parent 5d0ccf3b24
commit 6e80c36e2a
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,10 @@
20030516
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2003/05/15 13:52:10
[ssh.c]
Make "ssh -V" print the OpenSSL version in a human readable form. Patch
from Craig Leres (mindrot at ee.lbl.gov); ok markus@
20030515 20030515
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2003/05/14 13:11:56 - jmc@cvs.openbsd.org 2003/05/14 13:11:56
@ -1528,4 +1535,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2723 2003/05/15 11:42:59 dtucker Exp $ $Id: ChangeLog,v 1.2724 2003/05/16 01:38:00 djm Exp $

6
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.192 2003/05/11 20:30:25 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.193 2003/05/15 13:52:10 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -357,11 +357,11 @@ again:
/* fallthrough */ /* fallthrough */
case 'V': case 'V':
fprintf(stderr, fprintf(stderr,
"%s, SSH protocols %d.%d/%d.%d, OpenSSL 0x%8.8lx\n", "%s, SSH protocols %d.%d/%d.%d, %s\n",
SSH_VERSION, SSH_VERSION,
PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1, PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
SSLeay()); SSLeay_version(SSLEAY_VERSION));
if (opt == 'V') if (opt == 'V')
exit(0); exit(0);
break; break;