diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-29 10:17:09 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-29 10:17:09 +1100 |
commit | d00d1611e4233b540d0f6f354e37fdd758a44d8f (patch) | |
tree | 92670d224ca7e5a3fd6cf2b975add1ac052285de | |
parent | e79334a2b06d4c897c4b764e5e94af72320e3ea9 (diff) |
- Print whether OpenSSH was compiled with RSARef, patch from
Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | acconfig.h | 4 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | ssh.c | 6 | ||||
-rw-r--r-- | sshd.c | 5 |
5 files changed, 17 insertions, 3 deletions
@@ -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 @@ -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 ae8afdf4..581380ae 100644 --- 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. @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.14 1999/12/13 23:47:16 damien Exp $"); +RCSID("$Id: ssh.c,v 1.15 1999/12/28 23:17:09 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -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; @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.46 1999/12/28 04:09:36 damien Exp $"); +RCSID("$Id: sshd.c,v 1.47 1999/12/28 23:17:09 damien Exp $"); #ifdef HAVE_POLL_H # include <poll.h> @@ -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); |