2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cf14ea84..801ca5a12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - (djm) OpenBSD CVS Sync
    - 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;
      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 $
diff --git a/ssh.c b/ssh.c
index 0e2b7628e..096116b8b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #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/err.h>
@@ -357,11 +357,11 @@ again:
                         /* fallthrough */
                 case 'V':
                         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,
                             PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
                             PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
-                            SSLeay());
+                            SSLeay_version(SSLEAY_VERSION));
                         if (opt == 'V')
                                 exit(0);
                         break;