- Print whether OpenSSH was compiled with RSARef, patch from

   Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>

diff --git a/ChangeLog b/ChangeLog
index 680462f5c874fe290da431f4c76fa69fec422231..f3a1108fd98b34fbcaad90af463059acd6406f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
  - Fix --with-default-path option.
  - Autodetect perl, patch from David Rankin 
    <drankin@bohemians.lexington.ky.us>
+ - Print whether OpenSSH was compiled with RSARef, patch from 
+   Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>
 
 19991228
  - Replacement for getpagesize() for systems which lack it

diff --git a/acconfig.h b/acconfig.h
index dc0c281856582d9ad7d1c3b1d12520c327c875b7..c64eb72a89f538081356971ed8f30d3212d36288 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,6 +30,10 @@
 /* Define if your ssl headers are included with #include <openssl/header.h>  */
 #undef HAVE_OPENSSL
 
+/* Define if you are linking against RSAref.  Used only to print the right
+ * message at run-time. */
+#undef RSAREF
+
 /* Define is utmp.h has a ut_host field */
 #undef HAVE_HOST_IN_UTMP
 

diff --git a/configure.in b/configure.in
index ae8afdf4d36647d38068478f515acb1794c40b0f..581380ae2948104637c9b9c0d3bea5b895aa1717 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -96,7 +96,8 @@ AC_MSG_CHECKING([for RSAref library])
 saved_LIBS="$LIBS"
 LIBS="$saved_LIBS -lRSAglue -lrsaref"
 AC_TRY_LINK([], [],
-[AC_MSG_RESULT(yes); ],
+[AC_MSG_RESULT(yes);
+ AC_DEFINE(RSAREF)],
 [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
 
 dnl Checks for libraries.

diff --git a/ssh.c b/ssh.c
index e84e9ed5609cd35a01f0ec2b1f7e20e8e2b82531..ff7c29c83a67053bc7941effc5a2e1d119ec2217 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -305,7 +305,11 @@ main(int ac, char **av)
                case 'V':
                        fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n",
                            SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR);
+#ifndef RSAREF
                        fprintf(stderr, "Compiled with SSL.\n");
+#else
+                       fprintf(stderr, "Compiled with SSL (RSAref version).\n");
+#endif
                        if (opt == 'V')
                                exit(0);
                        debug_flag = 1;

diff --git a/sshd.c b/sshd.c
index 14642abd198ee212061fef1d075d31a8a7569d3b..6fdfb9af6036b7a374806a1765856c8d50b57ba0 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -510,6 +510,9 @@ main(int ac, char **av)
                case '?':
                default:
                        fprintf(stderr, "sshd version %s\n", SSH_VERSION);
+#ifdef RSAREF
+                       fprintf(stderr, "Compiled with RSAref.\n");
+#endif
                        fprintf(stderr, "Usage: %s [options]\n", av0);
                        fprintf(stderr, "Options:\n");
                        fprintf(stderr, "  -f file    Configuration file (default %s)\n", SERVER_CONFIG_FILE);