1 files changed, 19 insertions, 3 deletions

diff --git a/ssh.c b/ssh.c
index 76040fd59..d369b68e9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.401 2014/02/26 20:18:37 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.402 2014/04/29 18:01:49 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -71,8 +71,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#endif
 #include "openbsd-compat/openssl-compat.h"
 #include "openbsd-compat/sys-queue.h"
 
@@ -631,7 +633,13 @@ main(int ac, char **av)
                         break;
                 case 'V':
                         fprintf(stderr, "%s, %s\n",
-                            SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
+                            SSH_RELEASE,
+#ifdef WITH_OPENSSL
+                            SSLeay_version(SSLEAY_VERSION)
+#else
+                            "without OpenSSL"
+#endif
+                        );
                         if (opt == 'V')
                                 exit(0);
                         break;
@@ -828,8 +836,10 @@ main(int ac, char **av)
 
         host_arg = xstrdup(host);
 
+#ifdef WITH_OPENSSL
         OpenSSL_add_all_algorithms();
         ERR_load_crypto_strings();
+#endif
 
         /* Initialize the command to execute on remote host. */
         buffer_init(&command);
@@ -876,7 +886,13 @@ main(int ac, char **av)
             SYSLOG_FACILITY_USER, !use_syslog);
 
         if (debug_flag)
-                logit("%s, %s", SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
+                logit("%s, %s", SSH_RELEASE,
+#ifdef WITH_OPENSSL
+                    SSLeay_version(SSLEAY_VERSION)
+#else
+                    "without OpenSSL"
+#endif
+                );
 
         /* Parse the configuration files */
         process_config_files(pw);